qabstractgallery.h | qabstractgallery.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QABSTRACTGALLERY_H | #ifndef QABSTRACTGALLERY_H | |||
#define QABSTRACTGALLERY_H | #define QABSTRACTGALLERY_H | |||
#include <qgalleryabstractrequest.h> | #include <qgalleryabstractrequest.h> | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qabstractsecuritysession.h | qabstractsecuritysession.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QABSTRACTSECURITYSESSION_H | #ifndef QABSTRACTSECURITYSESSION_H | |||
#define QABSTRACTSECURITYSESSION_H | #define QABSTRACTSECURITYSESSION_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include <QObject> | #include <QObject> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qabstractvideobuffer.h | qabstractvideobuffer.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QABSTRACTVIDEOBUFFER_H | #ifndef QABSTRACTVIDEOBUFFER_H | |||
#define QABSTRACTVIDEOBUFFER_H | #define QABSTRACTVIDEOBUFFER_H | |||
#include <qmobilityglobal.h> | #include <qmobilityglobal.h> | |||
#include <qtmedianamespace.h> | #include <qtmedianamespace.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qabstractvideosurface.h | qabstractvideosurface.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QABSTRACTVIDEOSURFACE_H | #ifndef QABSTRACTVIDEOSURFACE_H | |||
#define QABSTRACTVIDEOSURFACE_H | #define QABSTRACTVIDEOSURFACE_H | |||
#include <QtCore/qobject.h> | #include <QtCore/qobject.h> | |||
#include <qvideoframe.h> | #include <qvideoframe.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qaccelerometer.h | qaccelerometer.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qambientlightsensor.h | qambientlightsensor.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qaudio.h | qaudio.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QAUDIO_H | #ifndef QAUDIO_H | |||
#define QAUDIO_H | #define QAUDIO_H | |||
#include <qmobilityglobal.h> | #include <qmobilityglobal.h> | |||
#include <qtmedianamespace.h> | #include <qtmedianamespace.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qaudiocapturesource.h | qaudiocapturesource.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qaudiodeviceinfo.h | qaudiodeviceinfo.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QAUDIODEVICEINFO_H | #ifndef QAUDIODEVICEINFO_H | |||
#define QAUDIODEVICEINFO_H | #define QAUDIODEVICEINFO_H | |||
#include <QtCore/qobject.h> | #include <QtCore/qobject.h> | |||
#include <QtCore/qbytearray.h> | #include <QtCore/qbytearray.h> | |||
#include <QtCore/qstring.h> | #include <QtCore/qstring.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qaudioencodercontrol.h | qaudioencodercontrol.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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" | |||
#include "qmediarecorder.h" | #include "qmediarecorder.h" | |||
#include <QtCore/qlist.h> | #include <QtCore/qlist.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qaudioendpointselector.h | qaudioendpointselector.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QAUDIOENDPOINTSELECTOR_H | #ifndef QAUDIOENDPOINTSELECTOR_H | |||
#define QAUDIOENDPOINTSELECTOR_H | #define QAUDIOENDPOINTSELECTOR_H | |||
#include <qaudio.h> | #include <qaudio.h> | |||
#include <qmediacontrol.h> | #include <qmediacontrol.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qaudioformat.h | qaudioformat.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QAUDIOFORMAT_H | #ifndef QAUDIOFORMAT_H | |||
#define QAUDIOFORMAT_H | #define QAUDIOFORMAT_H | |||
#include <QtCore/qobject.h> | #include <QtCore/qobject.h> | |||
#include <QtCore/qshareddata.h> | #include <QtCore/qshareddata.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qaudioinput.h | qaudioinput.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QAUDIOINPUT_H | #ifndef QAUDIOINPUT_H | |||
#define QAUDIOINPUT_H | #define QAUDIOINPUT_H | |||
#include <QtCore/qiodevice.h> | #include <QtCore/qiodevice.h> | |||
#include <qmobilityglobal.h> | #include <qmobilityglobal.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qaudiooutput.h | qaudiooutput.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QAUDIOOUTPUT_H | #ifndef QAUDIOOUTPUT_H | |||
#define QAUDIOOUTPUT_H | #define QAUDIOOUTPUT_H | |||
#include <QtCore/qiodevice.h> | #include <QtCore/qiodevice.h> | |||
#include <qmobilityglobal.h> | #include <qmobilityglobal.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qaudiosystem.h | qaudiosystem.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QAUDIOSYSTEM_H | #ifndef QAUDIOSYSTEM_H | |||
#define QAUDIOSYSTEM_H | #define QAUDIOSYSTEM_H | |||
#include <qmobilityglobal.h> | #include <qmobilityglobal.h> | |||
#include <qtmedianamespace.h> | #include <qtmedianamespace.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qaudiosystemplugin.h | qaudiosystemplugin.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QAUDIOSYSTEMPLUGIN_H | #ifndef QAUDIOSYSTEMPLUGIN_H | |||
#define QAUDIOSYSTEMPLUGIN_H | #define QAUDIOSYSTEMPLUGIN_H | |||
#include <QtCore/qstring.h> | #include <QtCore/qstring.h> | |||
#include <QtCore/qplugin.h> | #include <QtCore/qplugin.h> | |||
#include <QtCore/qfactoryinterface.h> | #include <QtCore/qfactoryinterface.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcamera.h | qcamera.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCAMERA_H | #ifndef QCAMERA_H | |||
#define QCAMERA_H | #define QCAMERA_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> | |||
skipping to change at line 60 | skipping to change at line 60 | |||
#include <qmediacontrol.h> | #include <qmediacontrol.h> | |||
#include <qmediaobject.h> | #include <qmediaobject.h> | |||
#include <qmediaservice.h> | #include <qmediaservice.h> | |||
#include <qcameraexposure.h> | #include <qcameraexposure.h> | |||
#include <qcamerafocus.h> | #include <qcamerafocus.h> | |||
#include <qcameraimageprocessing.h> | #include <qcameraimageprocessing.h> | |||
#include <qmediaserviceprovider.h> | #include <qmediaserviceprovider.h> | |||
#include <qmediaenumdebug.h> | ||||
QT_BEGIN_NAMESPACE | QT_BEGIN_NAMESPACE | |||
class QAbstractVideoSurface; | ||||
class QVideoWidget; | class QVideoWidget; | |||
class QGraphicsVideoItem; | class QGraphicsVideoItem; | |||
class QCameraPrivate; | class QCameraPrivate; | |||
class Q_MULTIMEDIA_EXPORT QCamera : public QMediaObject | class Q_MULTIMEDIA_EXPORT QCamera : public QMediaObject | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
Q_PROPERTY(QCamera::State state READ state NOTIFY stateChanged) | Q_PROPERTY(QCamera::State state READ state NOTIFY stateChanged) | |||
Q_PROPERTY(QCamera::Status status READ status NOTIFY statusChanged) | Q_PROPERTY(QCamera::Status status READ status NOTIFY statusChanged) | |||
Q_PROPERTY(QCamera::CaptureMode captureMode READ captureMode WRITE setC aptureMode NOTIFY captureModeChanged) | Q_PROPERTY(QCamera::CaptureMode captureMode READ captureMode WRITE setC aptureMode NOTIFY captureModeChanged) | |||
skipping to change at line 160 | skipping to change at line 162 | |||
CaptureMode captureMode() const; | CaptureMode captureMode() const; | |||
bool isCaptureModeSupported(CaptureMode mode) const; | bool isCaptureModeSupported(CaptureMode mode) const; | |||
QCameraExposure *exposure() const; | QCameraExposure *exposure() const; | |||
QCameraFocus *focus() const; | QCameraFocus *focus() const; | |||
QCameraImageProcessing *imageProcessing() const; | QCameraImageProcessing *imageProcessing() const; | |||
void setViewfinder(QVideoWidget *viewfinder); | void setViewfinder(QVideoWidget *viewfinder); | |||
void setViewfinder(QGraphicsVideoItem *viewfinder); | void setViewfinder(QGraphicsVideoItem *viewfinder); | |||
void setViewfinder(QAbstractVideoSurface *surface); | ||||
Error error() const; | Error error() const; | |||
QString errorString() const; | QString errorString() const; | |||
QCamera::LockTypes supportedLocks() const; | QCamera::LockTypes supportedLocks() const; | |||
QCamera::LockTypes requestedLocks() const; | QCamera::LockTypes requestedLocks() const; | |||
QCamera::LockStatus lockStatus() const; | QCamera::LockStatus lockStatus() const; | |||
QCamera::LockStatus lockStatus(QCamera::LockType lock) const; | QCamera::LockStatus lockStatus(QCamera::LockType lock) const; | |||
skipping to change at line 220 | skipping to change at line 223 | |||
QT_END_NAMESPACE | QT_END_NAMESPACE | |||
Q_DECLARE_METATYPE(QCamera::State) | Q_DECLARE_METATYPE(QCamera::State) | |||
Q_DECLARE_METATYPE(QCamera::Status) | Q_DECLARE_METATYPE(QCamera::Status) | |||
Q_DECLARE_METATYPE(QCamera::Error) | Q_DECLARE_METATYPE(QCamera::Error) | |||
Q_DECLARE_METATYPE(QCamera::CaptureMode) | Q_DECLARE_METATYPE(QCamera::CaptureMode) | |||
Q_DECLARE_METATYPE(QCamera::LockType) | Q_DECLARE_METATYPE(QCamera::LockType) | |||
Q_DECLARE_METATYPE(QCamera::LockStatus) | Q_DECLARE_METATYPE(QCamera::LockStatus) | |||
Q_DECLARE_METATYPE(QCamera::LockChangeReason) | Q_DECLARE_METATYPE(QCamera::LockChangeReason) | |||
Q_MEDIA_ENUM_DEBUG(QCamera, State) | ||||
Q_MEDIA_ENUM_DEBUG(QCamera, Status) | ||||
Q_MEDIA_ENUM_DEBUG(QCamera, Error) | ||||
Q_MEDIA_ENUM_DEBUG(QCamera, CaptureMode) | ||||
Q_MEDIA_ENUM_DEBUG(QCamera, LockType) | ||||
Q_MEDIA_ENUM_DEBUG(QCamera, LockStatus) | ||||
Q_MEDIA_ENUM_DEBUG(QCamera, LockChangeReason) | ||||
#endif // QCAMERA_H | #endif // QCAMERA_H | |||
End of changes. 7 change blocks. | ||||
14 lines changed or deleted | 25 lines changed or added | |||
qcameracontrol.h | qcameracontrol.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCAMERACONTROL_H | #ifndef QCAMERACONTROL_H | |||
#define QCAMERACONTROL_H | #define QCAMERACONTROL_H | |||
#include <qmediacontrol.h> | #include <qmediacontrol.h> | |||
#include <qmediaobject.h> | #include <qmediaobject.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcameraexposure.h | qcameraexposure.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCAMERAEXPOSURE_H | #ifndef QCAMERAEXPOSURE_H | |||
#define QCAMERAEXPOSURE_H | #define QCAMERAEXPOSURE_H | |||
#include <qmediaobject.h> | #include <qmediaobject.h> | |||
#include <qmediaenumdebug.h> | ||||
QT_BEGIN_NAMESPACE | QT_BEGIN_NAMESPACE | |||
class QCamera; | class QCamera; | |||
class QCameraExposurePrivate; | class QCameraExposurePrivate; | |||
class Q_MULTIMEDIA_EXPORT QCameraExposure : public QObject | class Q_MULTIMEDIA_EXPORT QCameraExposure : public QObject | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
Q_PROPERTY(qreal aperture READ aperture NOTIFY apertureChanged) | Q_PROPERTY(qreal aperture READ aperture NOTIFY apertureChanged) | |||
skipping to change at line 173 | skipping to change at line 174 | |||
}; | }; | |||
Q_DECLARE_OPERATORS_FOR_FLAGS(QCameraExposure::FlashModes) | Q_DECLARE_OPERATORS_FOR_FLAGS(QCameraExposure::FlashModes) | |||
QT_END_NAMESPACE | QT_END_NAMESPACE | |||
Q_DECLARE_METATYPE(QCameraExposure::ExposureMode) | Q_DECLARE_METATYPE(QCameraExposure::ExposureMode) | |||
Q_DECLARE_METATYPE(QCameraExposure::FlashModes) | Q_DECLARE_METATYPE(QCameraExposure::FlashModes) | |||
Q_DECLARE_METATYPE(QCameraExposure::MeteringMode) | Q_DECLARE_METATYPE(QCameraExposure::MeteringMode) | |||
Q_MEDIA_ENUM_DEBUG(QCameraExposure, ExposureMode) | ||||
Q_MEDIA_ENUM_DEBUG(QCameraExposure, FlashMode) | ||||
Q_MEDIA_ENUM_DEBUG(QCameraExposure, MeteringMode) | ||||
#endif // QCAMERAEXPOSURE_H | #endif // QCAMERAEXPOSURE_H | |||
End of changes. 5 change blocks. | ||||
14 lines changed or deleted | 19 lines changed or added | |||
qcameraexposurecontrol.h | qcameraexposurecontrol.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCAMERAEXPOSURECONTROL_H | #ifndef QCAMERAEXPOSURECONTROL_H | |||
#define QCAMERAEXPOSURECONTROL_H | #define QCAMERAEXPOSURECONTROL_H | |||
#include <qmediacontrol.h> | #include <qmediacontrol.h> | |||
#include <qmediaobject.h> | #include <qmediaobject.h> | |||
#include <qcameraexposure.h> | #include <qcameraexposure.h> | |||
#include <qcamera.h> | #include <qcamera.h> | |||
#include <qmediaenumdebug.h> | ||||
QT_BEGIN_NAMESPACE | QT_BEGIN_NAMESPACE | |||
class Q_MULTIMEDIA_EXPORT QCameraExposureControl : public QMediaControl | class Q_MULTIMEDIA_EXPORT QCameraExposureControl : public QMediaControl | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
Q_ENUMS(ExposureParameter) | Q_ENUMS(ExposureParameter) | |||
public: | public: | |||
~QCameraExposureControl(); | ~QCameraExposureControl(); | |||
skipping to change at line 110 | skipping to change at line 111 | |||
protected: | protected: | |||
QCameraExposureControl(QObject* parent = 0); | QCameraExposureControl(QObject* parent = 0); | |||
}; | }; | |||
#define QCameraExposureControl_iid "com.nokia.Qt.QCameraExposureControl/1.0 " | #define QCameraExposureControl_iid "com.nokia.Qt.QCameraExposureControl/1.0 " | |||
Q_MEDIA_DECLARE_CONTROL(QCameraExposureControl, QCameraExposureControl_iid) | Q_MEDIA_DECLARE_CONTROL(QCameraExposureControl, QCameraExposureControl_iid) | |||
Q_DECLARE_OPERATORS_FOR_FLAGS(QCameraExposureControl::ParameterFlags) | Q_DECLARE_OPERATORS_FOR_FLAGS(QCameraExposureControl::ParameterFlags) | |||
Q_MEDIA_ENUM_DEBUG(QCameraExposureControl, ExposureParameter) | ||||
QT_END_NAMESPACE | QT_END_NAMESPACE | |||
#endif // QCAMERAEXPOSURECONTROL_H | #endif // QCAMERAEXPOSURECONTROL_H | |||
End of changes. 5 change blocks. | ||||
14 lines changed or deleted | 17 lines changed or added | |||
qcameraflashcontrol.h | qcameraflashcontrol.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCAMERAFLASHCONTROL_H | #ifndef QCAMERAFLASHCONTROL_H | |||
#define QCAMERAFLASHCONTROL_H | #define QCAMERAFLASHCONTROL_H | |||
#include <qmediacontrol.h> | #include <qmediacontrol.h> | |||
#include <qmediaobject.h> | #include <qmediaobject.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcamerafocus.h | qcamerafocus.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCAMERAFOCUS_H | #ifndef QCAMERAFOCUS_H | |||
#define QCAMERAFOCUS_H | #define QCAMERAFOCUS_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 <QtCore/qpoint.h> | #include <QtCore/qpoint.h> | |||
#include <QtCore/qrect.h> | #include <QtCore/qrect.h> | |||
#include <QtCore/qshareddata.h> | #include <QtCore/qshareddata.h> | |||
#include <qmediaobject.h> | #include <qmediaobject.h> | |||
#include <qmediaenumdebug.h> | ||||
QT_BEGIN_NAMESPACE | QT_BEGIN_NAMESPACE | |||
class QCamera; | class QCamera; | |||
class QCameraFocusZoneData; | class QCameraFocusZoneData; | |||
class Q_MULTIMEDIA_EXPORT QCameraFocusZone { | class Q_MULTIMEDIA_EXPORT QCameraFocusZone { | |||
public: | public: | |||
enum FocusZoneStatus { | enum FocusZoneStatus { | |||
skipping to change at line 171 | skipping to change at line 172 | |||
QCameraFocusPrivate *d_ptr; | QCameraFocusPrivate *d_ptr; | |||
}; | }; | |||
Q_DECLARE_OPERATORS_FOR_FLAGS(QCameraFocus::FocusModes) | Q_DECLARE_OPERATORS_FOR_FLAGS(QCameraFocus::FocusModes) | |||
QT_END_NAMESPACE | QT_END_NAMESPACE | |||
Q_DECLARE_METATYPE(QCameraFocus::FocusModes) | Q_DECLARE_METATYPE(QCameraFocus::FocusModes) | |||
Q_DECLARE_METATYPE(QCameraFocus::FocusPointMode) | Q_DECLARE_METATYPE(QCameraFocus::FocusPointMode) | |||
Q_MEDIA_ENUM_DEBUG(QCameraFocus, FocusMode) | ||||
Q_MEDIA_ENUM_DEBUG(QCameraFocus, FocusPointMode) | ||||
#endif // QCAMERAFOCUS_H | #endif // QCAMERAFOCUS_H | |||
End of changes. 5 change blocks. | ||||
14 lines changed or deleted | 18 lines changed or added | |||
qcamerafocuscontrol.h | qcamerafocuscontrol.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCAMERAFOCUSCONTROL_H | #ifndef QCAMERAFOCUSCONTROL_H | |||
#define QCAMERAFOCUSCONTROL_H | #define QCAMERAFOCUSCONTROL_H | |||
#include <qmediacontrol.h> | #include <qmediacontrol.h> | |||
#include <qmediaobject.h> | #include <qmediaobject.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcameraimagecapture.h | qcameraimagecapture.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCAMERAIMAGECAPTURE_H | #ifndef QCAMERAIMAGECAPTURE_H | |||
#define QCAMERAIMAGECAPTURE_H | #define QCAMERAIMAGECAPTURE_H | |||
#include <qmediaobject.h> | #include <qmediaobject.h> | |||
#include <qmediaencodersettings.h> | #include <qmediaencodersettings.h> | |||
#include <qmediabindableinterface.h> | #include <qmediabindableinterface.h> | |||
#include <qvideoframe.h> | ||||
#include <qmediaenumdebug.h> | ||||
QT_BEGIN_NAMESPACE | QT_BEGIN_NAMESPACE | |||
class QSize; | class QSize; | |||
QT_END_NAMESPACE | QT_END_NAMESPACE | |||
QT_BEGIN_NAMESPACE | QT_BEGIN_NAMESPACE | |||
class QImageEncoderSettings; | class QImageEncoderSettings; | |||
class QCameraImageCapturePrivate; | class QCameraImageCapturePrivate; | |||
class Q_MULTIMEDIA_EXPORT QCameraImageCapture : public QObject, public QMed iaBindableInterface | class Q_MULTIMEDIA_EXPORT QCameraImageCapture : public QObject, public QMed iaBindableInterface | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
Q_INTERFACES(QMediaBindableInterface) | Q_INTERFACES(QMediaBindableInterface) | |||
Q_ENUMS(Error) | Q_ENUMS(Error) | |||
Q_ENUMS(CaptureDestination) | ||||
Q_PROPERTY(bool readyForCapture READ isReadyForCapture NOTIFY readyForC aptureChanged) | Q_PROPERTY(bool readyForCapture READ isReadyForCapture NOTIFY readyForC aptureChanged) | |||
public: | public: | |||
enum Error | enum Error | |||
{ | { | |||
NoError, | NoError, | |||
NotReadyError, | NotReadyError, | |||
ResourceError, | ResourceError, | |||
OutOfSpaceError, | OutOfSpaceError, | |||
NotSupportedFeatureError, | NotSupportedFeatureError, | |||
FormatError | FormatError | |||
}; | }; | |||
enum DriveMode | enum DriveMode | |||
{ | { | |||
SingleImageCapture | SingleImageCapture | |||
}; | }; | |||
enum CaptureDestination | ||||
{ | ||||
CaptureToFile = 0x01, | ||||
CaptureToBuffer = 0x02 | ||||
}; | ||||
Q_DECLARE_FLAGS(CaptureDestinations, CaptureDestination) | ||||
QCameraImageCapture(QMediaObject *mediaObject, QObject *parent = 0); | QCameraImageCapture(QMediaObject *mediaObject, QObject *parent = 0); | |||
~QCameraImageCapture(); | ~QCameraImageCapture(); | |||
bool isAvailable() const; | bool isAvailable() const; | |||
QtMultimediaKit::AvailabilityError availabilityError() const; | QtMultimediaKit::AvailabilityError availabilityError() const; | |||
QMediaObject *mediaObject() const; | QMediaObject *mediaObject() const; | |||
Error error() const; | Error error() const; | |||
QString errorString() const; | QString errorString() const; | |||
skipping to change at line 102 | skipping to change at line 113 | |||
QStringList supportedImageCodecs() const; | QStringList supportedImageCodecs() const; | |||
QString imageCodecDescription(const QString &codecName) const; | QString imageCodecDescription(const QString &codecName) const; | |||
QList<QSize> supportedResolutions(const QImageEncoderSettings &settings = QImageEncoderSettings(), | QList<QSize> supportedResolutions(const QImageEncoderSettings &settings = QImageEncoderSettings(), | |||
bool *continuous = 0) const; | bool *continuous = 0) const; | |||
QImageEncoderSettings encodingSettings() const; | QImageEncoderSettings encodingSettings() const; | |||
void setEncodingSettings(const QImageEncoderSettings& settings); | void setEncodingSettings(const QImageEncoderSettings& settings); | |||
QList<QVideoFrame::PixelFormat> supportedBufferFormats() const; | ||||
QVideoFrame::PixelFormat bufferFormat() const; | ||||
void setBufferFormat(QVideoFrame::PixelFormat format); | ||||
bool isCaptureDestinationSupported(CaptureDestinations destination) con | ||||
st; | ||||
CaptureDestinations captureDestination() const; | ||||
void setCaptureDestination(CaptureDestinations destination); | ||||
public Q_SLOTS: | public Q_SLOTS: | |||
int capture(const QString &location = QString()); | int capture(const QString &location = QString()); | |||
void cancelCapture(); | void cancelCapture(); | |||
Q_SIGNALS: | Q_SIGNALS: | |||
void error(int id, QCameraImageCapture::Error error, const QString &err orString); | void error(int id, QCameraImageCapture::Error error, const QString &err orString); | |||
void readyForCaptureChanged(bool); | void readyForCaptureChanged(bool); | |||
void bufferFormatChanged(QVideoFrame::PixelFormat); | ||||
void captureDestinationChanged(QCameraImageCapture::CaptureDestinations | ||||
); | ||||
void imageExposed(int id); | void imageExposed(int id); | |||
void imageCaptured(int id, const QImage &preview); | void imageCaptured(int id, const QImage &preview); | |||
void imageMetadataAvailable(int id, QtMultimediaKit::MetaData key, cons | ||||
t QVariant &value); | ||||
void imageMetadataAvailable(int id, const QString &key, const QVariant | ||||
&value); | ||||
void imageAvailable(int id, const QVideoFrame &image); | ||||
void imageSaved(int id, const QString &fileName); | void imageSaved(int id, const QString &fileName); | |||
protected: | protected: | |||
bool setMediaObject(QMediaObject *); | bool setMediaObject(QMediaObject *); | |||
QCameraImageCapturePrivate *d_ptr; | QCameraImageCapturePrivate *d_ptr; | |||
private: | private: | |||
Q_DISABLE_COPY(QCameraImageCapture) | Q_DISABLE_COPY(QCameraImageCapture) | |||
Q_DECLARE_PRIVATE(QCameraImageCapture) | Q_DECLARE_PRIVATE(QCameraImageCapture) | |||
Q_PRIVATE_SLOT(d_func(), void _q_error(int, int, const QString &)) | Q_PRIVATE_SLOT(d_func(), void _q_error(int, int, const QString &)) | |||
Q_PRIVATE_SLOT(d_func(), void _q_readyChanged(bool)) | Q_PRIVATE_SLOT(d_func(), void _q_readyChanged(bool)) | |||
}; | }; | |||
Q_DECLARE_OPERATORS_FOR_FLAGS(QCameraImageCapture::CaptureDestinations) | ||||
QT_END_NAMESPACE | QT_END_NAMESPACE | |||
Q_DECLARE_METATYPE(QCameraImageCapture::Error) | Q_DECLARE_METATYPE(QCameraImageCapture::Error) | |||
Q_DECLARE_METATYPE(QCameraImageCapture::CaptureDestination) | ||||
Q_DECLARE_METATYPE(QCameraImageCapture::CaptureDestinations) | ||||
Q_MEDIA_ENUM_DEBUG(QCameraImageCapture, Error) | ||||
Q_MEDIA_ENUM_DEBUG(QCameraImageCapture, CaptureDestination) | ||||
#endif | #endif | |||
End of changes. 11 change blocks. | ||||
14 lines changed or deleted | 49 lines changed or added | |||
qcameraimagecapturecontrol.h | qcameraimagecapturecontrol.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCAMERAIMAGECAPTURECONTROL_H | #ifndef QCAMERAIMAGECAPTURECONTROL_H | |||
#define QCAMERAIMAGECAPTURECONTROL_H | #define QCAMERAIMAGECAPTURECONTROL_H | |||
#include <qmediacontrol.h> | #include <qmediacontrol.h> | |||
#include <qcameraimagecapture.h> | #include <qcameraimagecapture.h> | |||
skipping to change at line 74 | skipping to change at line 74 | |||
virtual void setDriveMode(QCameraImageCapture::DriveMode mode) = 0; | virtual void setDriveMode(QCameraImageCapture::DriveMode mode) = 0; | |||
virtual int capture(const QString &fileName) = 0; | virtual int capture(const QString &fileName) = 0; | |||
virtual void cancelCapture() = 0; | virtual void cancelCapture() = 0; | |||
Q_SIGNALS: | Q_SIGNALS: | |||
void readyForCaptureChanged(bool); | void readyForCaptureChanged(bool); | |||
void imageExposed(int id); | void imageExposed(int id); | |||
void imageCaptured(int id, const QImage &preview); | void imageCaptured(int id, const QImage &preview); | |||
void imageMetadataAvailable(int id, QtMultimediaKit::MetaData key, cons | ||||
t QVariant &value); | ||||
void imageMetadataAvailable(int id, const QString &key, const QVariant | ||||
&value); | ||||
void imageAvailable(int id, const QVideoFrame &buffer); | ||||
void imageSaved(int id, const QString &fileName); | void imageSaved(int id, const QString &fileName); | |||
void error(int id, int error, const QString &errorString); | void error(int id, int error, const QString &errorString); | |||
protected: | protected: | |||
QCameraImageCaptureControl(QObject* parent = 0); | QCameraImageCaptureControl(QObject* parent = 0); | |||
}; | }; | |||
#define QCameraImageCaptureControl_iid "com.nokia.Qt.QCameraImageCaptureCon trol/1.0" | #define QCameraImageCaptureControl_iid "com.nokia.Qt.QCameraImageCaptureCon trol/1.0" | |||
Q_MEDIA_DECLARE_CONTROL(QCameraImageCaptureControl, QCameraImageCaptureCont rol_iid) | Q_MEDIA_DECLARE_CONTROL(QCameraImageCaptureControl, QCameraImageCaptureCont rol_iid) | |||
End of changes. 4 change blocks. | ||||
14 lines changed or deleted | 19 lines changed or added | |||
qcameraimageprocessing.h | qcameraimageprocessing.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCAMERAIMAGEPROCESSING_H | #ifndef QCAMERAIMAGEPROCESSING_H | |||
#define QCAMERAIMAGEPROCESSING_H | #define QCAMERAIMAGEPROCESSING_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 <QtCore/qpoint.h> | #include <QtCore/qpoint.h> | |||
#include <QtCore/qrect.h> | #include <QtCore/qrect.h> | |||
#include <qmediacontrol.h> | #include <qmediacontrol.h> | |||
#include <qmediaobject.h> | #include <qmediaobject.h> | |||
#include <qmediaservice.h> | #include <qmediaservice.h> | |||
#include <qmediaenumdebug.h> | ||||
QT_BEGIN_NAMESPACE | QT_BEGIN_NAMESPACE | |||
class QCamera; | class QCamera; | |||
class QCameraImageProcessingPrivate; | class QCameraImageProcessingPrivate; | |||
class Q_MULTIMEDIA_EXPORT QCameraImageProcessing : public QObject | class Q_MULTIMEDIA_EXPORT QCameraImageProcessing : public QObject | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
Q_ENUMS(WhiteBalanceMode) | ||||
public: | public: | |||
enum WhiteBalanceMode { | enum WhiteBalanceMode { | |||
WhiteBalanceAuto = 0, | WhiteBalanceAuto = 0, | |||
WhiteBalanceManual = 1, | WhiteBalanceManual = 1, | |||
WhiteBalanceSunlight = 2, | WhiteBalanceSunlight = 2, | |||
WhiteBalanceCloudy = 3, | WhiteBalanceCloudy = 3, | |||
WhiteBalanceShade = 4, | WhiteBalanceShade = 4, | |||
WhiteBalanceTungsten = 5, | WhiteBalanceTungsten = 5, | |||
WhiteBalanceFluorescent = 6, | WhiteBalanceFluorescent = 6, | |||
WhiteBalanceIncandescent = 7, | WhiteBalanceIncandescent = 7, | |||
skipping to change at line 112 | skipping to change at line 114 | |||
QCameraImageProcessing(QCamera *camera); | QCameraImageProcessing(QCamera *camera); | |||
~QCameraImageProcessing(); | ~QCameraImageProcessing(); | |||
Q_DISABLE_COPY(QCameraImageProcessing) | Q_DISABLE_COPY(QCameraImageProcessing) | |||
Q_DECLARE_PRIVATE(QCameraImageProcessing) | Q_DECLARE_PRIVATE(QCameraImageProcessing) | |||
QCameraImageProcessingPrivate *d_ptr; | QCameraImageProcessingPrivate *d_ptr; | |||
}; | }; | |||
QT_END_NAMESPACE | QT_END_NAMESPACE | |||
Q_DECLARE_METATYPE(QCameraImageProcessing::WhiteBalanceMode) | ||||
Q_MEDIA_ENUM_DEBUG(QCameraImageProcessing, WhiteBalanceMode) | ||||
#endif // QCAMERAIMAGEPROCESSING_H | #endif // QCAMERAIMAGEPROCESSING_H | |||
End of changes. 6 change blocks. | ||||
14 lines changed or deleted | 20 lines changed or added | |||
qcameraimageprocessingcontrol.h | qcameraimageprocessingcontrol.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCAMERAIMAGEPROCESSINGCONTROL_H | #ifndef QCAMERAIMAGEPROCESSINGCONTROL_H | |||
#define QCAMERAIMAGEPROCESSINGCONTROL_H | #define QCAMERAIMAGEPROCESSINGCONTROL_H | |||
#include <qmediacontrol.h> | #include <qmediacontrol.h> | |||
#include <qmediaobject.h> | #include <qmediaobject.h> | |||
#include <qcamera.h> | #include <qcamera.h> | |||
#include <qmediaenumdebug.h> | ||||
QT_BEGIN_NAMESPACE | QT_BEGIN_NAMESPACE | |||
class Q_MULTIMEDIA_EXPORT QCameraImageProcessingControl : public QMediaCont rol | class Q_MULTIMEDIA_EXPORT QCameraImageProcessingControl : public QMediaCont rol | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
Q_ENUMS(ProcessingParameter) | ||||
public: | public: | |||
~QCameraImageProcessingControl(); | ~QCameraImageProcessingControl(); | |||
enum ProcessingParameter { | enum ProcessingParameter { | |||
Contrast = 0, | Contrast = 0, | |||
Saturation = 1, | Saturation = 1, | |||
Brightness = 2, | Brightness = 2, | |||
Sharpening = 3, | Sharpening = 3, | |||
Denoising = 4, | Denoising = 4, | |||
skipping to change at line 86 | skipping to change at line 88 | |||
protected: | protected: | |||
QCameraImageProcessingControl(QObject* parent = 0); | QCameraImageProcessingControl(QObject* parent = 0); | |||
}; | }; | |||
#define QCameraImageProcessingControl_iid "com.nokia.Qt.QCameraImageProcess ingControl/1.0" | #define QCameraImageProcessingControl_iid "com.nokia.Qt.QCameraImageProcess ingControl/1.0" | |||
Q_MEDIA_DECLARE_CONTROL(QCameraImageProcessingControl, QCameraImageProcessi ngControl_iid) | Q_MEDIA_DECLARE_CONTROL(QCameraImageProcessingControl, QCameraImageProcessi ngControl_iid) | |||
QT_END_NAMESPACE | QT_END_NAMESPACE | |||
Q_DECLARE_METATYPE(QCameraImageProcessingControl::ProcessingParameter) | ||||
Q_MEDIA_ENUM_DEBUG(QCameraImageProcessingControl, ProcessingParameter) | ||||
#endif | #endif | |||
End of changes. 6 change blocks. | ||||
14 lines changed or deleted | 20 lines changed or added | |||
qcameralockscontrol.h | qcameralockscontrol.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCAMERALOCKSCONTROL_H | #ifndef QCAMERALOCKSCONTROL_H | |||
#define QCAMERALOCKSCONTROL_H | #define QCAMERALOCKSCONTROL_H | |||
#include <qmediacontrol.h> | #include <qmediacontrol.h> | |||
#include <qmediaobject.h> | #include <qmediaobject.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcameraviewfinder.h | qcameraviewfinder.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCAMERAVIEWFINDER_H | #ifndef QCAMERAVIEWFINDER_H | |||
#define QCAMERAVIEWFINDER_H | #define QCAMERAVIEWFINDER_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> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcompass.h | qcompass.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontact.h | qcontact.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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> | |||
#include <QString> | #include <QString> | |||
#include <QPair> | #include <QPair> | |||
skipping to change at line 105 | skipping to change at line 105 | |||
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, or set with QCME::setContactDisplayLabel() ) display label of the contact */ | /* The (backend synthesized, or set with QCME::setContactDisplayLabel() ) display label of the contact */ | |||
QString displayLabel() const; | QString displayLabel() const; | |||
QStringList tags() const; | ||||
void clearTags(); | ||||
void addTag(const QString& tag); | ||||
void setTags(const QStringList& tags); | ||||
/* 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 */ | /* 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; | |||
End of changes. 4 change blocks. | ||||
14 lines changed or deleted | 19 lines changed or added | |||
qcontactabstractrequest.h | qcontactabstractrequest.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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" | |||
#include <QObject> | #include <QObject> | |||
skipping to change at line 59 | skipping to change at line 59 | |||
class QContactManagerEngine; | class QContactManagerEngine; | |||
class QContactAbstractRequestPrivate; | class QContactAbstractRequestPrivate; | |||
class Q_CONTACTS_EXPORT QContactAbstractRequest : public QObject | class Q_CONTACTS_EXPORT QContactAbstractRequest : public QObject | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
public: | public: | |||
~QContactAbstractRequest(); | ~QContactAbstractRequest(); | |||
Q_ENUMS(State) | ||||
enum State { | enum State { | |||
InactiveState = 0, // operation not yet started | InactiveState = 0, // operation not yet started | |||
ActiveState, // operation started, not yet finished | ActiveState, // operation started, not yet finished | |||
CanceledState, // operation is finished due to cancellation | CanceledState, // operation is finished due to cancellation | |||
FinishedState // operation either completed successfully or failed. No further results will become available. | FinishedState // operation either completed successfully or failed. No further results will become available. | |||
}; | }; | |||
State state() const; // replaces status() | State state() const; // replaces status() | |||
bool isInactive() const; | bool isInactive() const; | |||
bool isActive() const; | bool isActive() const; | |||
bool isFinished() const; | bool isFinished() const; | |||
bool isCanceled() const; | bool isCanceled() const; | |||
QContactManager::Error error() const; | QContactManager::Error error() const; | |||
Q_ENUMS(RequestType) | ||||
enum RequestType { | enum RequestType { | |||
InvalidRequest = 0, | InvalidRequest = 0, | |||
ContactFetchRequest, | ContactFetchRequest, | |||
ContactLocalIdFetchRequest, | ContactLocalIdFetchRequest, | |||
ContactRemoveRequest, | ContactRemoveRequest, | |||
ContactSaveRequest, | ContactSaveRequest, | |||
DetailDefinitionFetchRequest, | DetailDefinitionFetchRequest, | |||
DetailDefinitionRemoveRequest, | DetailDefinitionRemoveRequest, | |||
DetailDefinitionSaveRequest, | DetailDefinitionSaveRequest, | |||
RelationshipFetchRequest, | RelationshipFetchRequest, | |||
skipping to change at line 117 | skipping to change at line 119 | |||
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 QContactManagerEngineV2; | |||
friend class QContactManagerEngineV2Wrapper; | friend class QContactManagerEngineV2Wrapper; | |||
friend class QContactAbstractRequestPrivate; | friend class QContactAbstractRequestPrivate; | |||
#ifndef QT_NO_DEBUG_STREAM | ||||
Q_CONTACTS_EXPORT friend QDebug operator<<(QDebug dbg, const QContactAb | ||||
stractRequest& request); | ||||
#endif | ||||
}; | }; | |||
QTM_END_NAMESPACE | QTM_END_NAMESPACE | |||
#endif | #endif | |||
End of changes. 6 change blocks. | ||||
14 lines changed or deleted | 22 lines changed or added | |||
qcontactaction.h | qcontactaction.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTACTION_H | #ifndef QCONTACTACTION_H | |||
#define QCONTACTACTION_H | #define QCONTACTACTION_H | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
#include "qcontactfilter.h" | #include "qcontactfilter.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactactiondescriptor.h | qcontactactiondescriptor.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTACTIONDESCRIPTOR_H | #ifndef QCONTACTACTIONDESCRIPTOR_H | |||
#define QCONTACTACTIONDESCRIPTOR_H | #define QCONTACTACTIONDESCRIPTOR_H | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
#include "qcontactfilter.h" | #include "qcontactfilter.h" | |||
#include "qcontactdetail.h" | #include "qcontactdetail.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactactionfactory.h | qcontactactionfactory.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTACTIONFACTORY_H | #ifndef QCONTACTACTIONFACTORY_H | |||
#define QCONTACTACTIONFACTORY_H | #define QCONTACTACTIONFACTORY_H | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
#include "qcontactactiondescriptor.h" | #include "qcontactactiondescriptor.h" | |||
#include "qcontactactiontarget.h" | #include "qcontactactiontarget.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactactionfilter.h | qcontactactionfilter.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTACTIONFILTER_H | #ifndef QCONTACTACTIONFILTER_H | |||
#define QCONTACTACTIONFILTER_H | #define QCONTACTACTIONFILTER_H | |||
#include "qcontactfilter.h" | #include "qcontactfilter.h" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactactiontarget.h | qcontactactiontarget.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTACTIONTARGET_H | #ifndef QCONTACTACTIONTARGET_H | |||
#define QCONTACTACTIONTARGET_H | #define QCONTACTACTIONTARGET_H | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
#include "qcontact.h" | #include "qcontact.h" | |||
#include "qcontactdetail.h" | #include "qcontactdetail.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactaddress.h | qcontactaddress.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTADDRESS_H | #ifndef QCONTACTADDRESS_H | |||
#define QCONTACTADDRESS_H | #define QCONTACTADDRESS_H | |||
#include <QString> | #include <QString> | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
skipping to change at line 101 | skipping to change at line 101 | |||
void setPostcode(const QString& postcode) {setValue(FieldPostcode, post code);} | void setPostcode(const QString& postcode) {setValue(FieldPostcode, post code);} | |||
QString postcode() const {return value(FieldPostcode);} | QString postcode() const {return value(FieldPostcode);} | |||
void setCountry(const QString& country) {setValue(FieldCountry, country );} | void setCountry(const QString& country) {setValue(FieldCountry, country );} | |||
QString country() const {return value(FieldCountry);} | QString country() const {return value(FieldCountry);} | |||
void setPostOfficeBox(const QString& postOfficeBox) {setValue(FieldPost OfficeBox, postOfficeBox);} | void setPostOfficeBox(const QString& postOfficeBox) {setValue(FieldPost OfficeBox, postOfficeBox);} | |||
QString postOfficeBox() const {return value(FieldPostOfficeBox);} | QString postOfficeBox() const {return value(FieldPostOfficeBox);} | |||
void setSubTypes(const QStringList& subTypes) {setValue(FieldSubTypes, subTypes);} | void setSubTypes(const QStringList& subTypes) {setValue(FieldSubTypes, subTypes);} | |||
void setSubTypes(const QString& subType) {setValue(FieldSubTypes, QStri ngList(subType));} | void setSubTypes(const QString& subType) {setValue(FieldSubTypes, QStri ngList(subType));} | |||
QStringList subTypes() const {return value<QStringList>(FieldSubTypes); } | QStringList subTypes() const {return value<QStringList>(FieldSubTypes); } | |||
// Convenience filter | ||||
static QContactFilter match(const QString& subString); | ||||
}; | }; | |||
QTM_END_NAMESPACE | QTM_END_NAMESPACE | |||
#endif | #endif | |||
End of changes. 4 change blocks. | ||||
14 lines changed or deleted | 17 lines changed or added | |||
qcontactanniversary.h | qcontactanniversary.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTANNIVERSARY_H | #ifndef QCONTACTANNIVERSARY_H | |||
#define QCONTACTANNIVERSARY_H | #define QCONTACTANNIVERSARY_H | |||
#include <QString> | #include <QString> | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactavatar.h | qcontactavatar.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTAVATAR_H | #ifndef QCONTACTAVATAR_H | |||
#define QCONTACTAVATAR_H | #define QCONTACTAVATAR_H | |||
#include <QString> | #include <QString> | |||
#include <QUrl> | #include <QUrl> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactbirthday.h | qcontactbirthday.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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> | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactchangelogfilter.h | qcontactchangelogfilter.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTCHANGELOGFILTER_H | #ifndef QCONTACTCHANGELOGFILTER_H | |||
#define QCONTACTCHANGELOGFILTER_H | #define QCONTACTCHANGELOGFILTER_H | |||
#include "qcontactfilter.h" | #include "qcontactfilter.h" | |||
#include <QDateTime> | #include <QDateTime> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactchangeset.h | qcontactchangeset.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTCHANGESET_H | #ifndef QCONTACTCHANGESET_H | |||
#define QCONTACTCHANGESET_H | #define QCONTACTCHANGESET_H | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
#include "qcontactid.h" | #include "qcontactid.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactdetail.h | qcontactdetail.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactdetaildefinition.h | qcontactdetaildefinition.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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> | |||
#include <QString> | #include <QString> | |||
#include <QSharedDataPointer> | #include <QSharedDataPointer> | |||
skipping to change at line 99 | skipping to change at line 99 | |||
private: | private: | |||
QSharedDataPointer<QContactDetailDefinitionData> d; | QSharedDataPointer<QContactDetailDefinitionData> d; | |||
}; | }; | |||
#ifndef QT_NO_DATASTREAM | #ifndef QT_NO_DATASTREAM | |||
Q_CONTACTS_EXPORT QDataStream& operator<<(QDataStream& out, const QContactD etailDefinition& definition); | Q_CONTACTS_EXPORT QDataStream& operator<<(QDataStream& out, const QContactD etailDefinition& definition); | |||
Q_CONTACTS_EXPORT QDataStream& operator>>(QDataStream& in, QContactDetailDe finition& definition); | Q_CONTACTS_EXPORT QDataStream& operator>>(QDataStream& in, QContactDetailDe finition& definition); | |||
#endif | #endif | |||
#ifndef QT_NO_DEBUG_STREAM | ||||
Q_CONTACTS_EXPORT QDebug operator<<(QDebug dbg, const QContactDetailDefinit | ||||
ion& 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. | ||||
14 lines changed or deleted | 19 lines changed or added | |||
qcontactdetaildefinitionfetchrequest.h | qcontactdetaildefinitionfetchrequest.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTDETAILDEFINITIONFETCHREQUEST_H | #ifndef QCONTACTDETAILDEFINITIONFETCHREQUEST_H | |||
#define QCONTACTDETAILDEFINITIONFETCHREQUEST_H | #define QCONTACTDETAILDEFINITIONFETCHREQUEST_H | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
#include "qcontactabstractrequest.h" | #include "qcontactabstractrequest.h" | |||
#include "qcontactdetaildefinition.h" | #include "qcontactdetaildefinition.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactdetaildefinitionremoverequest.h | qcontactdetaildefinitionremoverequest.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTDETAILDEFINITIONREMOVEREQUEST_H | #ifndef QCONTACTDETAILDEFINITIONREMOVEREQUEST_H | |||
#define QCONTACTDETAILDEFINITIONREMOVEREQUEST_H | #define QCONTACTDETAILDEFINITIONREMOVEREQUEST_H | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
#include "qcontactabstractrequest.h" | #include "qcontactabstractrequest.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactdetaildefinitionsaverequest.h | qcontactdetaildefinitionsaverequest.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTDETAILDEFINITIONSAVEREQUEST_H | #ifndef QCONTACTDETAILDEFINITIONSAVEREQUEST_H | |||
#define QCONTACTDETAILDEFINITIONSAVEREQUEST_H | #define QCONTACTDETAILDEFINITIONSAVEREQUEST_H | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
#include "qcontactabstractrequest.h" | #include "qcontactabstractrequest.h" | |||
#include "qcontactdetaildefinition.h" | #include "qcontactdetaildefinition.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactdetailfielddefinition.h | qcontactdetailfielddefinition.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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> | |||
#include <QVariant> | #include <QVariant> | |||
#include <QSharedDataPointer> | #include <QSharedDataPointer> | |||
skipping to change at line 81 | skipping to change at line 81 | |||
private: | private: | |||
QSharedDataPointer<QContactDetailFieldDefinitionPrivate> d; | QSharedDataPointer<QContactDetailFieldDefinitionPrivate> d; | |||
}; | }; | |||
#ifndef QT_NO_DATASTREAM | #ifndef QT_NO_DATASTREAM | |||
Q_CONTACTS_EXPORT QDataStream& operator<<(QDataStream& out, const QContactD etailFieldDefinition& definition); | Q_CONTACTS_EXPORT QDataStream& operator<<(QDataStream& out, const QContactD etailFieldDefinition& definition); | |||
Q_CONTACTS_EXPORT QDataStream& operator>>(QDataStream& in, QContactDetailFi eldDefinition& definition); | Q_CONTACTS_EXPORT QDataStream& operator>>(QDataStream& in, QContactDetailFi eldDefinition& definition); | |||
#endif | #endif | |||
#ifndef QT_NO_DEBUG_STREAM | ||||
Q_CONTACTS_EXPORT QDebug operator<<(QDebug dbg, const QContactDetailFieldDe | ||||
finition& 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. | ||||
14 lines changed or deleted | 19 lines changed or added | |||
qcontactdetailfilter.h | qcontactdetailfilter.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTDETAILFILTER_H | #ifndef QCONTACTDETAILFILTER_H | |||
#define QCONTACTDETAILFILTER_H | #define QCONTACTDETAILFILTER_H | |||
#include "qcontactfilter.h" | #include "qcontactfilter.h" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactdetailrangefilter.h | qcontactdetailrangefilter.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTDETAILRANGEFILTER_H | #ifndef QCONTACTDETAILRANGEFILTER_H | |||
#define QCONTACTDETAILRANGEFILTER_H | #define QCONTACTDETAILRANGEFILTER_H | |||
#include "qcontactfilter.h" | #include "qcontactfilter.h" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactdetails.h | qcontactdetails.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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. | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactdisplaylabel.h | qcontactdisplaylabel.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTDISPLAYLABEL_H | #ifndef QCONTACTDISPLAYLABEL_H | |||
#define QCONTACTDISPLAYLABEL_H | #define QCONTACTDISPLAYLABEL_H | |||
#include <QString> | #include <QString> | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactemailaddress.h | qcontactemailaddress.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTEMAILADDRESS_H | #ifndef QCONTACTEMAILADDRESS_H | |||
#define QCONTACTEMAILADDRESS_H | #define QCONTACTEMAILADDRESS_H | |||
#include <QString> | #include <QString> | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactfamily.h | qcontactfamily.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTFAMILY_H | #ifndef QCONTACTFAMILY_H | |||
#define QCONTACTFAMILY_H | #define QCONTACTFAMILY_H | |||
#include <QString> | #include <QString> | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactfavorite.h | qcontactfavorite.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTFAVORITE_H | #ifndef QCONTACTFAVORITE_H | |||
#define QCONTACTFAVORITE_H | #define QCONTACTFAVORITE_H | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
#include "qcontactdetail.h" | #include "qcontactdetail.h" | |||
#include "qcontact.h" | #include "qcontact.h" | |||
skipping to change at line 69 | skipping to change at line 69 | |||
#else | #else | |||
Q_DECLARE_CUSTOM_CONTACT_DETAIL(QContactFavorite, "Favorite") | Q_DECLARE_CUSTOM_CONTACT_DETAIL(QContactFavorite, "Favorite") | |||
Q_DECLARE_LATIN1_CONSTANT(FieldFavorite, "Favorite"); | Q_DECLARE_LATIN1_CONSTANT(FieldFavorite, "Favorite"); | |||
Q_DECLARE_LATIN1_CONSTANT(FieldIndex, "Index"); | Q_DECLARE_LATIN1_CONSTANT(FieldIndex, "Index"); | |||
#endif | #endif | |||
void setFavorite(bool isFavorite) {setValue(FieldFavorite, isFavorite); } | void setFavorite(bool isFavorite) {setValue(FieldFavorite, isFavorite); } | |||
bool isFavorite() const {return variantValue(FieldFavorite).toBool();} | bool isFavorite() const {return variantValue(FieldFavorite).toBool();} | |||
void setIndex(int index) {setValue(FieldIndex, index);} | void setIndex(int index) {setValue(FieldIndex, index);} | |||
int index() const {return variantValue(FieldIndex).toInt();} | int index() const {return variantValue(FieldIndex).toInt();} | |||
// Convenience filter | ||||
static QContactFilter match(); | ||||
}; | }; | |||
QTM_END_NAMESPACE | QTM_END_NAMESPACE | |||
#endif | #endif | |||
End of changes. 4 change blocks. | ||||
14 lines changed or deleted | 17 lines changed or added | |||
qcontactfetchbyidrequest.h | qcontactfetchbyidrequest.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTFETCHBYIDREQUEST_H | #ifndef QCONTACTFETCHBYIDREQUEST_H | |||
#define QCONTACTFETCHBYIDREQUEST_H | #define QCONTACTFETCHBYIDREQUEST_H | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
#include "qcontactabstractrequest.h" | #include "qcontactabstractrequest.h" | |||
#include "qcontact.h" | #include "qcontact.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactfetchhint.h | qcontactfetchhint.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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> | |||
skipping to change at line 84 | skipping to change at line 84 | |||
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); | |||
int maxCountHint() const; | ||||
void setMaxCountHint(int count); | ||||
private: | private: | |||
QSharedDataPointer<QContactFetchHintPrivate> d; | QSharedDataPointer<QContactFetchHintPrivate> d; | |||
}; | }; | |||
#ifndef QT_NO_DATASTREAM | #ifndef QT_NO_DATASTREAM | |||
Q_CONTACTS_EXPORT QDataStream& operator<<(QDataStream& out, const QContactF etchHint& hint); | Q_CONTACTS_EXPORT QDataStream& operator<<(QDataStream& out, const QContactF etchHint& hint); | |||
Q_CONTACTS_EXPORT QDataStream& operator>>(QDataStream& in, QContactFetchHin t& hint); | Q_CONTACTS_EXPORT QDataStream& operator>>(QDataStream& in, QContactFetchHin t& hint); | |||
#endif | #endif | |||
#ifndef QT_NO_DEBUG_STREAM | ||||
Q_CONTACTS_EXPORT QDebug operator<<(QDebug dbg, const QContactFetchHint& hi | ||||
nt); | ||||
#endif | ||||
Q_DECLARE_OPERATORS_FOR_FLAGS(QContactFetchHint::OptimizationHints); | Q_DECLARE_OPERATORS_FOR_FLAGS(QContactFetchHint::OptimizationHints); | |||
QTM_END_NAMESPACE | QTM_END_NAMESPACE | |||
#endif | #endif | |||
End of changes. 5 change blocks. | ||||
14 lines changed or deleted | 22 lines changed or added | |||
qcontactfetchrequest.h | qcontactfetchrequest.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTFETCHREQUEST_H | #ifndef QCONTACTFETCHREQUEST_H | |||
#define QCONTACTFETCHREQUEST_H | #define QCONTACTFETCHREQUEST_H | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
#include "qcontactabstractrequest.h" | #include "qcontactabstractrequest.h" | |||
#include "qcontactsortorder.h" | #include "qcontactsortorder.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactfilter.h | qcontactfilter.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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> | |||
#include <QList> | #include <QList> | |||
#include <QDateTime> | #include <QDateTime> | |||
skipping to change at line 118 | skipping to change at line 118 | |||
protected: | protected: | |||
explicit QContactFilter(QContactFilterPrivate* d); | explicit QContactFilter(QContactFilterPrivate* d); | |||
protected: | protected: | |||
friend class QContactFilterPrivate; | friend class QContactFilterPrivate; | |||
#ifndef QT_NO_DATASTREAM | #ifndef QT_NO_DATASTREAM | |||
Q_CONTACTS_EXPORT friend QDataStream& operator<<(QDataStream& out, cons t QContactFilter& filter); | Q_CONTACTS_EXPORT friend QDataStream& operator<<(QDataStream& out, cons t QContactFilter& filter); | |||
Q_CONTACTS_EXPORT friend QDataStream& operator>>(QDataStream& in, QCont actFilter& filter); | Q_CONTACTS_EXPORT friend QDataStream& operator>>(QDataStream& in, QCont actFilter& filter); | |||
#endif | #endif | |||
#ifndef QT_NO_DEBUG_STREAM | ||||
Q_CONTACTS_EXPORT friend QDebug operator<<(QDebug dbg, const QContactFi | ||||
lter& filter); | ||||
#endif | ||||
QSharedDataPointer<QContactFilterPrivate> d_ptr; | QSharedDataPointer<QContactFilterPrivate> d_ptr; | |||
}; | }; | |||
Q_DECLARE_OPERATORS_FOR_FLAGS(QContactFilter::MatchFlags); | 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 | |||
End of changes. 4 change blocks. | ||||
14 lines changed or deleted | 18 lines changed or added | |||
qcontactfilters.h | qcontactfilters.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTFILTERS_H | #ifndef QCONTACTFILTERS_H | |||
#define QCONTACTFILTERS_H | #define QCONTACTFILTERS_H | |||
// this file includes all of the leaf filter classes | // this file includes all of the leaf filter classes | |||
// provided by the Qt Contacts API. | // provided by the Qt Contacts API. | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactgender.h | qcontactgender.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTGENDER_H | #ifndef QCONTACTGENDER_H | |||
#define QCONTACTGENDER_H | #define QCONTACTGENDER_H | |||
#include <QString> | #include <QString> | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactgeolocation.h | qcontactgeolocation.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTGEOLOCATION_H | #ifndef QCONTACTGEOLOCATION_H | |||
#define QCONTACTGEOLOCATION_H | #define QCONTACTGEOLOCATION_H | |||
#include <QString> | #include <QString> | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactglobalpresence.h | qcontactglobalpresence.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTGLOBALPRESENCE_H | #ifndef QCONTACTGLOBALPRESENCE_H | |||
#define QCONTACTGLOBALPRESENCE_H | #define QCONTACTGLOBALPRESENCE_H | |||
#include <QString> | #include <QString> | |||
#include <QUrl> | #include <QUrl> | |||
skipping to change at line 89 | skipping to change at line 89 | |||
void setNickname(const QString& nickname) {setValue(FieldNickname, nick name);} | void setNickname(const QString& nickname) {setValue(FieldNickname, nick name);} | |||
QString nickname() const {return value(FieldNickname);} | QString nickname() const {return value(FieldNickname);} | |||
void setPresenceState(QContactPresence::PresenceState presenceState) {s etValue(FieldPresenceState, static_cast<int>(presenceState));} | void setPresenceState(QContactPresence::PresenceState presenceState) {s etValue(FieldPresenceState, static_cast<int>(presenceState));} | |||
QContactPresence::PresenceState presenceState() const {return static_ca st<QContactPresence::PresenceState>(value<int>(FieldPresenceState));} | QContactPresence::PresenceState presenceState() const {return static_ca st<QContactPresence::PresenceState>(value<int>(FieldPresenceState));} | |||
void setPresenceStateText(const QString& presenceStateText) {setValue(F ieldPresenceStateText, presenceStateText);} | void setPresenceStateText(const QString& presenceStateText) {setValue(F ieldPresenceStateText, presenceStateText);} | |||
QString presenceStateText() const {return value(FieldPresenceStateText) ;} | QString presenceStateText() const {return value(FieldPresenceStateText) ;} | |||
void setPresenceStateImageUrl(const QUrl& presenceStateImageUrl) {setVa lue(FieldPresenceStateImageUrl, presenceStateImageUrl);} | void setPresenceStateImageUrl(const QUrl& presenceStateImageUrl) {setVa lue(FieldPresenceStateImageUrl, presenceStateImageUrl);} | |||
QUrl presenceStateImageUrl() const {return value<QUrl>(FieldPresenceSta teImageUrl);} | QUrl presenceStateImageUrl() const {return value<QUrl>(FieldPresenceSta teImageUrl);} | |||
void setCustomMessage(const QString& customMessage) {setValue(FieldCust omMessage, customMessage);} | void setCustomMessage(const QString& customMessage) {setValue(FieldCust omMessage, customMessage);} | |||
QString customMessage() const {return value(FieldCustomMessage);} | QString customMessage() const {return value(FieldCustomMessage);} | |||
// convenience filtering functions | ||||
static QContactFilter match(QContactPresence::PresenceState state); | ||||
}; | }; | |||
QTM_END_NAMESPACE | QTM_END_NAMESPACE | |||
#endif | #endif | |||
End of changes. 4 change blocks. | ||||
14 lines changed or deleted | 17 lines changed or added | |||
qcontactguid.h | qcontactguid.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTGUID_H | #ifndef QCONTACTGUID_H | |||
#define QCONTACTGUID_H | #define QCONTACTGUID_H | |||
#include <QString> | #include <QString> | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontacthobby.h | qcontacthobby.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTHOBBY_H | #ifndef QCONTACTHOBBY_H | |||
#define QCONTACTHOBBY_H | #define QCONTACTHOBBY_H | |||
#include <QString> | #include <QString> | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactid.h | qcontactid.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactintersectionfilter.h | qcontactintersectionfilter.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTINTERSECTIONFILTER_H | #ifndef QCONTACTINTERSECTIONFILTER_H | |||
#define QCONTACTINTERSECTIONFILTER_H | #define QCONTACTINTERSECTIONFILTER_H | |||
#include "qcontactfilter.h" | #include "qcontactfilter.h" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactinvalidfilter.h | qcontactinvalidfilter.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTINVALIDFILTER_H | #ifndef QCONTACTINVALIDFILTER_H | |||
#define QCONTACTINVALIDFILTER_H | #define QCONTACTINVALIDFILTER_H | |||
#include "qcontactfilter.h" | #include "qcontactfilter.h" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactlocalidfetchrequest.h | qcontactlocalidfetchrequest.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTIDFETCHREQUEST_H | #ifndef QCONTACTIDFETCHREQUEST_H | |||
#define QCONTACTIDFETCHREQUEST_H | #define QCONTACTIDFETCHREQUEST_H | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
#include "qcontactabstractrequest.h" | #include "qcontactabstractrequest.h" | |||
#include "qcontactsortorder.h" | #include "qcontactsortorder.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactlocalidfilter.h | qcontactlocalidfilter.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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" | |||
#include "qcontactid.h" | #include "qcontactid.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactmanager.h | qcontactmanager.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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> | |||
#include <QMap> | #include <QMap> | |||
skipping to change at line 104 | skipping to change at line 104 | |||
~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); | 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! */ | ||||
enum Error { | enum Error { | |||
NoError = 0, | NoError = 0, | |||
DoesNotExistError, | DoesNotExistError, | |||
AlreadyExistsError, | AlreadyExistsError, | |||
InvalidDetailError, | InvalidDetailError, | |||
InvalidRelationshipError, | InvalidRelationshipError, | |||
LockedError, | LockedError, | |||
DetailAccessError, | DetailAccessError, | |||
PermissionsError, | PermissionsError, | |||
OutOfMemoryError, | OutOfMemoryError, | |||
NotSupportedError, | NotSupportedError, | |||
BadArgumentError, | BadArgumentError, | |||
UnspecifiedError, | UnspecifiedError, | |||
VersionMismatchError, | VersionMismatchError, | |||
LimitReachedError, | LimitReachedError, | |||
InvalidContactTypeError | InvalidContactTypeError, | |||
TimeoutError | ||||
}; | }; | |||
/* Error reporting */ | /* Error reporting */ | |||
QContactManager::Error error() const; | QContactManager::Error error() const; | |||
QMap<int, QContactManager::Error> errorMap() 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; | |||
skipping to change at line 199 | skipping to change at line 199 | |||
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); // need both? or just new? | void selfContactIdChanged(const QContactLocalId& oldId, const QContactL ocalId& newId); // need both? or just new? | |||
protected: | ||||
void connectNotify(const char *signal); | ||||
void disconnectNotify(const char *signal); | ||||
private: | private: | |||
friend class QContactManagerData; | friend class QContactManagerData; | |||
void createEngine(const QString& managerName, const QMap<QString, QStri ng>& parameters); | void createEngine(const QString& managerName, const QMap<QString, QStri ng>& parameters); | |||
Q_DISABLE_COPY(QContactManager) | Q_DISABLE_COPY(QContactManager) | |||
Q_PRIVATE_SLOT(d, void _q_contactsUpdated(const QList<QContactLocalId>& | ||||
ids)) | ||||
Q_PRIVATE_SLOT(d, void _q_contactsDeleted(const QList<QContactLocalId>& | ||||
ids)) | ||||
// private data pointer | // private data pointer | |||
QContactManagerData* d; | QContactManagerData* d; | |||
}; | }; | |||
QTM_END_NAMESPACE | QTM_END_NAMESPACE | |||
#endif | #endif | |||
End of changes. 8 change blocks. | ||||
16 lines changed or deleted | 27 lines changed or added | |||
qcontactmanagerengine.h | qcontactmanagerengine.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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> | |||
#include <QMap> | #include <QMap> | |||
#include <QList> | #include <QList> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactmanagerenginefactory.h | qcontactmanagerenginefactory.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTMANAGERENGINEFACTORY_H | #ifndef QCONTACTMANAGERENGINEFACTORY_H | |||
#define QCONTACTMANAGERENGINEFACTORY_H | #define QCONTACTMANAGERENGINEFACTORY_H | |||
#include <QtPlugin> | #include <QtPlugin> | |||
#include <QMap> | #include <QMap> | |||
#include <QString> | #include <QString> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactname.h | qcontactname.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTNAME_H | #ifndef QCONTACTNAME_H | |||
#define QCONTACTNAME_H | #define QCONTACTNAME_H | |||
#include <QString> | #include <QString> | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactnickname.h | qcontactnickname.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTNICKNAME_H | #ifndef QCONTACTNICKNAME_H | |||
#define QCONTACTNICKNAME_H | #define QCONTACTNICKNAME_H | |||
#include <QString> | #include <QString> | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactnote.h | qcontactnote.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTNOTE_H | #ifndef QCONTACTNOTE_H | |||
#define QCONTACTNOTE_H | #define QCONTACTNOTE_H | |||
#include <QString> | #include <QString> | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactonlineaccount.h | qcontactonlineaccount.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTONLINEACCOUNT_H | #ifndef QCONTACTONLINEACCOUNT_H | |||
#define QCONTACTONLINEACCOUNT_H | #define QCONTACTONLINEACCOUNT_H | |||
#include <QString> | #include <QString> | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
skipping to change at line 61 | skipping to change at line 61 | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
/* Leaf class */ | /* Leaf class */ | |||
class Q_CONTACTS_EXPORT QContactOnlineAccount : public QContactDetail | class Q_CONTACTS_EXPORT QContactOnlineAccount : public QContactDetail | |||
{ | { | |||
public: | public: | |||
#ifdef Q_QDOC | #ifdef Q_QDOC | |||
static const QLatin1Constant DefinitionName; | static const QLatin1Constant DefinitionName; | |||
static const QLatin1Constant FieldAccountUri; | static const QLatin1Constant FieldAccountUri; | |||
static const QLatin1Constant FieldServiceProvider; | static const QLatin1Constant FieldServiceProvider; | |||
static const QLatin1Constant FieldProtocol; | ||||
static const QLatin1Constant FieldCapabilities; | static const QLatin1Constant FieldCapabilities; | |||
static const QLatin1Constant FieldSubTypes; | static const QLatin1Constant FieldSubTypes; | |||
static const QLatin1Constant SubTypeSip; | static const QLatin1Constant SubTypeSip; | |||
static const QLatin1Constant SubTypeSipVoip; | static const QLatin1Constant SubTypeSipVoip; | |||
static const QLatin1Constant SubTypeImpp; | static const QLatin1Constant SubTypeImpp; | |||
static const QLatin1Constant SubTypeVideoShare; | static const QLatin1Constant SubTypeVideoShare; | |||
static const QLatin1Constant ProtocolAim; | ||||
static const QLatin1Constant ProtocolIcq; | ||||
static const QLatin1Constant ProtocolIrc; | ||||
static const QLatin1Constant ProtocolJabber; | ||||
static const QLatin1Constant ProtocolMsn; | ||||
static const QLatin1Constant ProtocolQq; | ||||
static const QLatin1Constant ProtocolSkype; | ||||
static const QLatin1Constant ProtocolYahoo; | ||||
#else | #else | |||
Q_DECLARE_CUSTOM_CONTACT_DETAIL(QContactOnlineAccount, "OnlineAccount") | Q_DECLARE_CUSTOM_CONTACT_DETAIL(QContactOnlineAccount, "OnlineAccount") | |||
Q_DECLARE_LATIN1_CONSTANT(FieldAccountUri, "AccountUri"); | Q_DECLARE_LATIN1_CONSTANT(FieldAccountUri, "AccountUri"); | |||
Q_DECLARE_LATIN1_CONSTANT(FieldServiceProvider, "ServiceProvider"); | Q_DECLARE_LATIN1_CONSTANT(FieldServiceProvider, "ServiceProvider"); | |||
Q_DECLARE_LATIN1_CONSTANT(FieldProtocol, "Protocol"); | ||||
Q_DECLARE_LATIN1_CONSTANT(FieldCapabilities, "Capabilities"); | Q_DECLARE_LATIN1_CONSTANT(FieldCapabilities, "Capabilities"); | |||
Q_DECLARE_LATIN1_CONSTANT(FieldSubTypes, "SubTypes"); | Q_DECLARE_LATIN1_CONSTANT(FieldSubTypes, "SubTypes"); | |||
Q_DECLARE_LATIN1_CONSTANT(SubTypeSip, "Sip"); | Q_DECLARE_LATIN1_CONSTANT(SubTypeSip, "Sip"); | |||
Q_DECLARE_LATIN1_CONSTANT(SubTypeSipVoip, "SipVoip"); | Q_DECLARE_LATIN1_CONSTANT(SubTypeSipVoip, "SipVoip"); | |||
Q_DECLARE_LATIN1_CONSTANT(SubTypeImpp, "Impp"); | Q_DECLARE_LATIN1_CONSTANT(SubTypeImpp, "Impp"); | |||
Q_DECLARE_LATIN1_CONSTANT(SubTypeVideoShare, "VideoShare"); | Q_DECLARE_LATIN1_CONSTANT(SubTypeVideoShare, "VideoShare"); | |||
// These strings are taken from | ||||
// http://telepathy.freedesktop.org/spec/Connection_Manager.html#Simple | ||||
-Type:Protocol | ||||
Q_DECLARE_LATIN1_CONSTANT(ProtocolAim, "aim"); | ||||
Q_DECLARE_LATIN1_CONSTANT(ProtocolIcq, "icq"); | ||||
Q_DECLARE_LATIN1_CONSTANT(ProtocolIrc, "irc"); | ||||
Q_DECLARE_LATIN1_CONSTANT(ProtocolJabber, "jabber"); | ||||
Q_DECLARE_LATIN1_CONSTANT(ProtocolMsn, "msn"); | ||||
Q_DECLARE_LATIN1_CONSTANT(ProtocolQq, "qq"); | ||||
Q_DECLARE_LATIN1_CONSTANT(ProtocolSkype, "skype"); | ||||
Q_DECLARE_LATIN1_CONSTANT(ProtocolYahoo, "yahoo"); | ||||
#endif | #endif | |||
void setAccountUri(const QString& accountUri) {setValue(FieldAccountUri , accountUri);} | void setAccountUri(const QString& accountUri) {setValue(FieldAccountUri , accountUri);} | |||
QString accountUri() const {return value(FieldAccountUri);} | QString accountUri() const {return value(FieldAccountUri);} | |||
void setServiceProvider(const QString& serviceProvider) {setValue(Field ServiceProvider, serviceProvider);} | void setServiceProvider(const QString& serviceProvider) {setValue(Field ServiceProvider, serviceProvider);} | |||
QString serviceProvider() const {return value(FieldServiceProvider);} | QString serviceProvider() const {return value(FieldServiceProvider);} | |||
void setProtocol(const QString& protocol) {setValue(FieldProtocol, prot | ||||
ocol);} | ||||
QString protocol() const {return value(FieldProtocol);} | ||||
void setCapabilities(const QStringList& capabilities) {setValue(FieldCa pabilities, capabilities);} | void setCapabilities(const QStringList& capabilities) {setValue(FieldCa pabilities, capabilities);} | |||
QStringList capabilities() const {return value<QStringList>(FieldCapabi lities);} | QStringList capabilities() const {return value<QStringList>(FieldCapabi lities);} | |||
void setSubTypes(const QStringList& subTypes) {setValue(FieldSubTypes, subTypes);} | void setSubTypes(const QStringList& subTypes) {setValue(FieldSubTypes, subTypes);} | |||
void setSubTypes(const QString& subType) {setValue(FieldSubTypes, QStri ngList(subType));} | void setSubTypes(const QString& subType) {setValue(FieldSubTypes, QStri ngList(subType));} | |||
QStringList subTypes() const {return value<QStringList>(FieldSubTypes); } | QStringList subTypes() const {return value<QStringList>(FieldSubTypes); } | |||
}; | }; | |||
QTM_END_NAMESPACE | QTM_END_NAMESPACE | |||
End of changes. 8 change blocks. | ||||
14 lines changed or deleted | 40 lines changed or added | |||
qcontactorganization.h | qcontactorganization.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTORGANIZATION_H | #ifndef QCONTACTORGANIZATION_H | |||
#define QCONTACTORGANIZATION_H | #define QCONTACTORGANIZATION_H | |||
#include <QString> | #include <QString> | |||
#include <QUrl> | #include <QUrl> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactphonenumber.h | qcontactphonenumber.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTPHONENUMBER_H | #ifndef QCONTACTPHONENUMBER_H | |||
#define QCONTACTPHONENUMBER_H | #define QCONTACTPHONENUMBER_H | |||
#include <QString> | #include <QString> | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactpresence.h | qcontactpresence.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTPRESENCE_H | #ifndef QCONTACTPRESENCE_H | |||
#define QCONTACTPRESENCE_H | #define QCONTACTPRESENCE_H | |||
#include <QString> | #include <QString> | |||
#include <QUrl> | #include <QUrl> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactrelationship.h | qcontactrelationship.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactrelationshipfetchrequest.h | qcontactrelationshipfetchrequest.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTRELATIONSHIPFETCHREQUEST_H | #ifndef QCONTACTRELATIONSHIPFETCHREQUEST_H | |||
#define QCONTACTRELATIONSHIPFETCHREQUEST_H | #define QCONTACTRELATIONSHIPFETCHREQUEST_H | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
#include "qcontactabstractrequest.h" | #include "qcontactabstractrequest.h" | |||
#include "qcontactrelationship.h" | #include "qcontactrelationship.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactrelationshipfilter.h | qcontactrelationshipfilter.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTRELATIONSHIPFILTER_H | #ifndef QCONTACTRELATIONSHIPFILTER_H | |||
#define QCONTACTRELATIONSHIPFILTER_H | #define QCONTACTRELATIONSHIPFILTER_H | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
#include "qcontactfilter.h" | #include "qcontactfilter.h" | |||
#include "qcontactid.h" | #include "qcontactid.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactrelationshipremoverequest.h | qcontactrelationshipremoverequest.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTRELATIONSHIPREMOVEREQUEST_H | #ifndef QCONTACTRELATIONSHIPREMOVEREQUEST_H | |||
#define QCONTACTRELATIONSHIPREMOVEREQUEST_H | #define QCONTACTRELATIONSHIPREMOVEREQUEST_H | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
#include "qcontactabstractrequest.h" | #include "qcontactabstractrequest.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactrelationshipsaverequest.h | qcontactrelationshipsaverequest.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTRELATIONSHIPSAVEREQUEST_H | #ifndef QCONTACTRELATIONSHIPSAVEREQUEST_H | |||
#define QCONTACTRELATIONSHIPSAVEREQUEST_H | #define QCONTACTRELATIONSHIPSAVEREQUEST_H | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
#include "qcontactabstractrequest.h" | #include "qcontactabstractrequest.h" | |||
#include "qcontactrelationship.h" | #include "qcontactrelationship.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactremoverequest.h | qcontactremoverequest.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTREMOVEREQUEST_H | #ifndef QCONTACTREMOVEREQUEST_H | |||
#define QCONTACTREMOVEREQUEST_H | #define QCONTACTREMOVEREQUEST_H | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
#include "qcontactabstractrequest.h" | #include "qcontactabstractrequest.h" | |||
#include "qcontactfilter.h" | #include "qcontactfilter.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactrequests.h | qcontactrequests.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTREQUESTS_H | #ifndef QCONTACTREQUESTS_H | |||
#define QCONTACTREQUESTS_H | #define QCONTACTREQUESTS_H | |||
// this file includes all of the asynchronous request | // this file includes all of the asynchronous request | |||
// leaf classes that are included in the public API | // leaf classes that are included in the public API | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactringtone.h | qcontactringtone.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTRINGTONE_H | #ifndef QCONTACTRINGTONE_H | |||
#define QCONTACTRINGTONE_H | #define QCONTACTRINGTONE_H | |||
#include <QString> | #include <QString> | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactsaverequest.h | qcontactsaverequest.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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" | |||
#include "qcontactabstractrequest.h" | #include "qcontactabstractrequest.h" | |||
#include "qcontact.h" | #include "qcontact.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactsortorder.h | qcontactsortorder.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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" | |||
#include <QString> | #include <QString> | |||
skipping to change at line 98 | skipping to change at line 98 | |||
private: | private: | |||
QSharedDataPointer<QContactSortOrderPrivate> d; | QSharedDataPointer<QContactSortOrderPrivate> d; | |||
}; | }; | |||
#ifndef QT_NO_DATASTREAM | #ifndef QT_NO_DATASTREAM | |||
Q_CONTACTS_EXPORT QDataStream& operator<<(QDataStream& out, const QContactS ortOrder& sortOrder); | Q_CONTACTS_EXPORT QDataStream& operator<<(QDataStream& out, const QContactS ortOrder& sortOrder); | |||
Q_CONTACTS_EXPORT QDataStream& operator>>(QDataStream& in, QContactSortOrde r& sortOrder); | Q_CONTACTS_EXPORT QDataStream& operator>>(QDataStream& in, QContactSortOrde r& sortOrder); | |||
#endif | #endif | |||
#ifndef QT_NO_DEBUG_STREAM | ||||
Q_CONTACTS_EXPORT QDebug operator<<(QDebug dbg, const QContactSortOrder& so | ||||
rtOrder); | ||||
#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. | ||||
14 lines changed or deleted | 19 lines changed or added | |||
qcontactsynctarget.h | qcontactsynctarget.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTSYNCTARGET_H | #ifndef QCONTACTSYNCTARGET_H | |||
#define QCONTACTSYNCTARGET_H | #define QCONTACTSYNCTARGET_H | |||
#include <QString> | #include <QString> | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontacttag.h | qcontacttag.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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> | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
skipping to change at line 67 | skipping to change at line 67 | |||
#ifdef Q_QDOC | #ifdef Q_QDOC | |||
static const QLatin1Constant DefinitionName; | static const QLatin1Constant DefinitionName; | |||
static const QLatin1Constant FieldTag; | static const QLatin1Constant FieldTag; | |||
#else | #else | |||
Q_DECLARE_CUSTOM_CONTACT_DETAIL(QContactTag, "Tag") | Q_DECLARE_CUSTOM_CONTACT_DETAIL(QContactTag, "Tag") | |||
Q_DECLARE_LATIN1_CONSTANT(FieldTag, "Tag"); | Q_DECLARE_LATIN1_CONSTANT(FieldTag, "Tag"); | |||
#endif | #endif | |||
void setTag(const QString& tag) {setValue(FieldTag, tag);} | void setTag(const QString& tag) {setValue(FieldTag, tag);} | |||
QString tag() const {return value(FieldTag);} | QString tag() const {return value(FieldTag);} | |||
// Convenience filter | ||||
static QContactFilter match(const QString& subString); | ||||
}; | }; | |||
QTM_END_NAMESPACE | QTM_END_NAMESPACE | |||
#endif | #endif | |||
End of changes. 4 change blocks. | ||||
14 lines changed or deleted | 17 lines changed or added | |||
qcontactthumbnail.h | qcontactthumbnail.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTTHUMBNAIL_H | #ifndef QCONTACTTHUMBNAIL_H | |||
#define QCONTACTTHUMBNAIL_H | #define QCONTACTTHUMBNAIL_H | |||
#include <QString> | #include <QString> | |||
#include <QImage> | #include <QImage> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontacttimestamp.h | qcontacttimestamp.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTTIMESTAMP_H | #ifndef QCONTACTTIMESTAMP_H | |||
#define QCONTACTTIMESTAMP_H | #define QCONTACTTIMESTAMP_H | |||
#include <QString> | #include <QString> | |||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontacttype.h | qcontacttype.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontactunionfilter.h | qcontactunionfilter.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTUNIONFILTER_H | #ifndef QCONTACTUNIONFILTER_H | |||
#define QCONTACTUNIONFILTER_H | #define QCONTACTUNIONFILTER_H | |||
#include "qcontactfilter.h" | #include "qcontactfilter.h" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qcontacturl.h | qcontacturl.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QCONTACTURL_H | #ifndef QCONTACTURL_H | |||
#define QCONTACTURL_H | #define QCONTACTURL_H | |||
#include <QString> | #include <QString> | |||
#include <QUrl> | ||||
#include "qtcontactsglobal.h" | #include "qtcontactsglobal.h" | |||
#include "qcontactdetail.h" | #include "qcontactdetail.h" | |||
#include "qcontact.h" | #include "qcontact.h" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
/* Leaf class */ | /* Leaf class */ | |||
class Q_CONTACTS_EXPORT QContactUrl : public QContactDetail | class Q_CONTACTS_EXPORT QContactUrl : public QContactDetail | |||
{ | { | |||
skipping to change at line 74 | skipping to change at line 75 | |||
#else | #else | |||
Q_DECLARE_CUSTOM_CONTACT_DETAIL(QContactUrl, "Url") | Q_DECLARE_CUSTOM_CONTACT_DETAIL(QContactUrl, "Url") | |||
Q_DECLARE_LATIN1_CONSTANT(FieldUrl, "Url"); | Q_DECLARE_LATIN1_CONSTANT(FieldUrl, "Url"); | |||
Q_DECLARE_LATIN1_CONSTANT(FieldSubType, "SubType"); | Q_DECLARE_LATIN1_CONSTANT(FieldSubType, "SubType"); | |||
Q_DECLARE_LATIN1_CONSTANT(SubTypeHomePage, "HomePage"); | Q_DECLARE_LATIN1_CONSTANT(SubTypeHomePage, "HomePage"); | |||
Q_DECLARE_LATIN1_CONSTANT(SubTypeBlog, "Blog"); | Q_DECLARE_LATIN1_CONSTANT(SubTypeBlog, "Blog"); | |||
Q_DECLARE_LATIN1_CONSTANT(SubTypeFavourite, "Favourite"); | Q_DECLARE_LATIN1_CONSTANT(SubTypeFavourite, "Favourite"); | |||
#endif | #endif | |||
void setUrl(const QString& url) {setValue(FieldUrl, url);} | void setUrl(const QString& url) {setValue(FieldUrl, url);} | |||
void setUrl(const QUrl& url) {setValue(FieldUrl, url.toString());} | ||||
QString url() const {return value(FieldUrl);} | QString url() const {return value(FieldUrl);} | |||
void setSubType(const QString& subType) {setValue(FieldSubType, subType );} | void setSubType(const QString& subType) {setValue(FieldSubType, subType );} | |||
QString subType() const {return value(FieldSubType);} | QString subType() const {return value(FieldSubType);} | |||
}; | }; | |||
QTM_END_NAMESPACE | QTM_END_NAMESPACE | |||
#endif | #endif | |||
End of changes. 5 change blocks. | ||||
14 lines changed or deleted | 16 lines changed or added | |||
qdocumentgallery.h | qdocumentgallery.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QDOCUMENTGALLERY_H | #ifndef QDOCUMENTGALLERY_H | |||
#define QDOCUMENTGALLERY_H | #define QDOCUMENTGALLERY_H | |||
#include <qabstractgallery.h> | #include <qabstractgallery.h> | |||
#include <qgalleryproperty.h> | #include <qgalleryproperty.h> | |||
#include <qgallerytype.h> | #include <qgallerytype.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qfeedbackactuator.h | qfeedbackactuator.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QFEEDBACKACTUATOR_H | #ifndef QFEEDBACKACTUATOR_H | |||
#define QFEEDBACKACTUATOR_H | #define QFEEDBACKACTUATOR_H | |||
#include <qmobilityglobal.h> | #include <qmobilityglobal.h> | |||
#include <QtCore/QObject> | #include <QtCore/QObject> | |||
QT_BEGIN_HEADER | QT_BEGIN_HEADER | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qfeedbackeffect.h | qfeedbackeffect.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QFEEDBACKEFFECT_H | #ifndef QFEEDBACKEFFECT_H | |||
#define QFEEDBACKEFFECT_H | #define QFEEDBACKEFFECT_H | |||
#include <qmobilityglobal.h> | #include <qmobilityglobal.h> | |||
#include <QtCore/QObject> | #include <QtCore/QObject> | |||
#include <QtCore/QStringList> | #include <QtCore/QStringList> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qfeedbackplugininterfaces.h | qfeedbackplugininterfaces.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QFEEDBACKPLUGIN_H | #ifndef QFEEDBACKPLUGIN_H | |||
#define QFEEDBACKPLUGIN_H | #define QFEEDBACKPLUGIN_H | |||
#include <qmobilityglobal.h> | #include <qmobilityglobal.h> | |||
#include "qfeedbackactuator.h" | #include "qfeedbackactuator.h" | |||
#include "qfeedbackeffect.h" | #include "qfeedbackeffect.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgalleryabstractrequest.h | qgalleryabstractrequest.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGALLERYABSTRACTREQUEST_H | #ifndef QGALLERYABSTRACTREQUEST_H | |||
#define QGALLERYABSTRACTREQUEST_H | #define QGALLERYABSTRACTREQUEST_H | |||
#include <qmobilityglobal.h> | #include <qmobilityglobal.h> | |||
#include <QtCore/qobject.h> | #include <QtCore/qobject.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgalleryabstractresponse.h | qgalleryabstractresponse.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGALLERYABSTRACTRESPONSE_H | #ifndef QGALLERYABSTRACTRESPONSE_H | |||
#define QGALLERYABSTRACTRESPONSE_H | #define QGALLERYABSTRACTRESPONSE_H | |||
#include <qgalleryabstractrequest.h> | #include <qgalleryabstractrequest.h> | |||
#include <QtCore/qstringlist.h> | #include <QtCore/qstringlist.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgalleryfilter.h | qgalleryfilter.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGALLERYFILTER_H | #ifndef QGALLERYFILTER_H | |||
#define QGALLERYFILTER_H | #define QGALLERYFILTER_H | |||
#include <qmobilityglobal.h> | #include <qmobilityglobal.h> | |||
#include <QtCore/qset.h> | #include <QtCore/qset.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgalleryitemrequest.h | qgalleryitemrequest.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGALLERYITEMREQUEST_H | #ifndef QGALLERYITEMREQUEST_H | |||
#define QGALLERYITEMREQUEST_H | #define QGALLERYITEMREQUEST_H | |||
#include <qgalleryabstractrequest.h> | #include <qgalleryabstractrequest.h> | |||
#include <qgalleryproperty.h> | #include <qgalleryproperty.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgalleryproperty.h | qgalleryproperty.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGALLERYPROPERTY_H | #ifndef QGALLERYPROPERTY_H | |||
#define QGALLERYPROPERTY_H | #define QGALLERYPROPERTY_H | |||
#include <qgalleryfilter.h> | #include <qgalleryfilter.h> | |||
#include <QtCore/qstring.h> | #include <QtCore/qstring.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgalleryquerymodel.h | qgalleryquerymodel.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGALLERYQUERYMODEL_H | #ifndef QGALLERYQUERYMODEL_H | |||
#define QGALLERYQUERYMODEL_H | #define QGALLERYQUERYMODEL_H | |||
#include <qgalleryqueryrequest.h> | #include <qgalleryqueryrequest.h> | |||
#include <QtCore/qabstractitemmodel.h> | #include <QtCore/qabstractitemmodel.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgalleryqueryrequest.h | qgalleryqueryrequest.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGALLERYQUERYREQUEST_H | #ifndef QGALLERYQUERYREQUEST_H | |||
#define QGALLERYQUERYREQUEST_H | #define QGALLERYQUERYREQUEST_H | |||
#include <qgalleryabstractrequest.h> | #include <qgalleryabstractrequest.h> | |||
#include <qgalleryproperty.h> | #include <qgalleryproperty.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgalleryresource.h | qgalleryresource.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGALLERYRESOURCE_H | #ifndef QGALLERYRESOURCE_H | |||
#define QGALLERYRESOURCE_H | #define QGALLERYRESOURCE_H | |||
#include <qmobilityglobal.h> | #include <qmobilityglobal.h> | |||
#include <QtCore/qurl.h> | #include <QtCore/qurl.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgalleryresultset.h | qgalleryresultset.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGALLERYRESULTSET_H | #ifndef QGALLERYRESULTSET_H | |||
#define QGALLERYRESULTSET_H | #define QGALLERYRESULTSET_H | |||
#include <qgalleryabstractresponse.h> | #include <qgalleryabstractresponse.h> | |||
#include <qgalleryproperty.h> | #include <qgalleryproperty.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgallerytype.h | qgallerytype.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGALLERYTYPE_H | #ifndef QGALLERYTYPE_H | |||
#define QGALLERYTYPE_H | #define QGALLERYTYPE_H | |||
#include <qmobilityglobal.h> | #include <qmobilityglobal.h> | |||
#include <QtCore/qstring.h> | #include <QtCore/qstring.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgallerytyperequest.h | qgallerytyperequest.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGALLERYTYPEREQUEST_H | #ifndef QGALLERYTYPEREQUEST_H | |||
#define QGALLERYTYPEREQUEST_H | #define QGALLERYTYPEREQUEST_H | |||
#include <qgalleryabstractrequest.h> | #include <qgalleryabstractrequest.h> | |||
#include <qgalleryproperty.h> | #include <qgalleryproperty.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgeoaddress.h | qgeoaddress.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOADDRESS_H | #ifndef QGEOADDRESS_H | |||
#define QGEOADDRESS_H | #define QGEOADDRESS_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include <QSharedDataPointer> | #include <QSharedDataPointer> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgeoareamonitor.h | qgeoareamonitor.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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" | |||
#include <QObject> | #include <QObject> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgeoboundingarea.h | qgeoboundingarea.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOBOUNDINGAREA_H | #ifndef QGEOBOUNDINGAREA_H | |||
#define QGEOBOUNDINGAREA_H | #define QGEOBOUNDINGAREA_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include <QSharedDataPointer> | #include <QSharedDataPointer> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgeoboundingbox.h | qgeoboundingbox.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOBOUNDINGBOX_H | #ifndef QGEOBOUNDINGBOX_H | |||
#define QGEOBOUNDINGBOX_H | #define QGEOBOUNDINGBOX_H | |||
#include "qgeoboundingarea.h" | #include "qgeoboundingarea.h" | |||
#include <QSharedDataPointer> | #include <QSharedDataPointer> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgeoboundingcircle.h | qgeoboundingcircle.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOBOUNDINGCIRCLE_H | #ifndef QGEOBOUNDINGCIRCLE_H | |||
#define QGEOBOUNDINGCIRCLE_H | #define QGEOBOUNDINGCIRCLE_H | |||
#include "qgeoboundingarea.h" | #include "qgeoboundingarea.h" | |||
#include <QSharedDataPointer> | #include <QSharedDataPointer> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgeocoordinate.h | qgeocoordinate.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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" | |||
#include <QString> | #include <QString> | |||
skipping to change at line 104 | skipping to change at line 104 | |||
void setLongitude(double longitude); | void setLongitude(double longitude); | |||
double longitude() const; | double longitude() const; | |||
void setAltitude(double altitude); | void setAltitude(double altitude); | |||
double altitude() const; | double altitude() const; | |||
qreal distanceTo(const QGeoCoordinate &other) const; | qreal distanceTo(const QGeoCoordinate &other) const; | |||
qreal azimuthTo(const QGeoCoordinate &other) const; | qreal azimuthTo(const QGeoCoordinate &other) const; | |||
QGeoCoordinate atDistanceAndAzimuth(qreal distance, qreal azimuth, qrea | ||||
l distanceUp = 0.0) const; | ||||
QString toString(CoordinateFormat format = DegreesMinutesSecondsWithHem isphere) const; | QString toString(CoordinateFormat format = DegreesMinutesSecondsWithHem isphere) const; | |||
private: | private: | |||
QGeoCoordinatePrivate *d; | QGeoCoordinatePrivate *d; | |||
friend class QGeoCoordinatePrivate; | ||||
}; | }; | |||
#ifndef QT_NO_DEBUG_STREAM | #ifndef QT_NO_DEBUG_STREAM | |||
Q_LOCATION_EXPORT QDebug operator<<(QDebug, const QGeoCoordinate &); | Q_LOCATION_EXPORT QDebug operator<<(QDebug, const QGeoCoordinate &); | |||
#endif | #endif | |||
#ifndef QT_NO_DATASTREAM | #ifndef QT_NO_DATASTREAM | |||
Q_LOCATION_EXPORT QDataStream &operator<<(QDataStream &stream, const QGeoCo ordinate &coordinate); | Q_LOCATION_EXPORT QDataStream &operator<<(QDataStream &stream, const QGeoCo ordinate &coordinate); | |||
Q_LOCATION_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoCoordina te &coordinate); | Q_LOCATION_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoCoordina te &coordinate); | |||
#endif | #endif | |||
End of changes. 5 change blocks. | ||||
14 lines changed or deleted | 19 lines changed or added | |||
qgeomaneuver.h | qgeomaneuver.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOMANEUVER_H | #ifndef QGEOMANEUVER_H | |||
#define QGEOMANEUVER_H | #define QGEOMANEUVER_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include <QExplicitlySharedDataPointer> | #include <QExplicitlySharedDataPointer> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgeomapcircleobject.h | qgeomapcircleobject.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOMAPCIRCLEOBJECT_H | #ifndef QGEOMAPCIRCLEOBJECT_H | |||
#define QGEOMAPCIRCLEOBJECT_H | #define QGEOMAPCIRCLEOBJECT_H | |||
#include "qgeomapobject.h" | #include "qgeomapobject.h" | |||
#include <QMetaType> | #include <QMetaType> | |||
skipping to change at line 65 | skipping to change at line 65 | |||
class QGeoMapCircleObjectPrivate; | class QGeoMapCircleObjectPrivate; | |||
class Q_LOCATION_EXPORT QGeoMapCircleObject : public QGeoMapObject | class Q_LOCATION_EXPORT QGeoMapCircleObject : public QGeoMapObject | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
public: | public: | |||
Q_PROPERTY(QGeoCoordinate center READ center WRITE setCenter NOTIFY cen terChanged) | Q_PROPERTY(QGeoCoordinate center READ center WRITE setCenter NOTIFY cen terChanged) | |||
Q_PROPERTY(qreal radius READ radius WRITE setRadius NOTIFY radiusChange d) | Q_PROPERTY(qreal radius READ radius WRITE setRadius NOTIFY radiusChange d) | |||
Q_PROPERTY(QPen pen READ pen WRITE setPen NOTIFY penChanged) | Q_PROPERTY(QPen pen READ pen WRITE setPen NOTIFY penChanged) | |||
Q_PROPERTY(QBrush brush READ brush WRITE setBrush NOTIFY brushChanged) | Q_PROPERTY(QBrush brush READ brush WRITE setBrush NOTIFY brushChanged) | |||
Q_PROPERTY(quint32 pointCount READ pointCount WRITE setPointCount) | ||||
QGeoMapCircleObject(); | QGeoMapCircleObject(); | |||
QGeoMapCircleObject(const QGeoBoundingCircle &circle); | QGeoMapCircleObject(const QGeoBoundingCircle &circle); | |||
QGeoMapCircleObject(const QGeoCoordinate ¢er, qreal radius); | QGeoMapCircleObject(const QGeoCoordinate ¢er, qreal radius); | |||
~QGeoMapCircleObject(); | ~QGeoMapCircleObject(); | |||
QGeoMapObject::Type type() const; | QGeoMapObject::Type type() const; | |||
QGeoBoundingCircle circle() const; | QGeoBoundingCircle circle() const; | |||
void setCircle(const QGeoBoundingCircle &circle); | void setCircle(const QGeoBoundingCircle &circle); | |||
bool contains(const QGeoCoordinate &coordinate) const; | ||||
QGeoCoordinate center() const; | QGeoCoordinate center() const; | |||
void setCenter(const QGeoCoordinate ¢er); | void setCenter(const QGeoCoordinate ¢er); | |||
qreal radius() const; | qreal radius() const; | |||
void setRadius(qreal radius); | void setRadius(qreal radius); | |||
QPen pen() const; | QPen pen() const; | |||
void setPen(const QPen &pen); | void setPen(const QPen &pen); | |||
QBrush brush() const; | QBrush brush() const; | |||
void setBrush(const QBrush &brush); | void setBrush(const QBrush &brush); | |||
quint32 pointCount() const; | ||||
void setPointCount(quint32 pointCount); | ||||
Q_SIGNALS: | Q_SIGNALS: | |||
void centerChanged(const QGeoCoordinate ¢er); | void centerChanged(const QGeoCoordinate ¢er); | |||
void radiusChanged(qreal radius); | void radiusChanged(qreal radius); | |||
void penChanged(const QPen &pen); | void penChanged(const QPen &pen); | |||
void brushChanged(const QBrush &brush); | void brushChanged(const QBrush &brush); | |||
private: | private: | |||
QGeoMapCircleObjectPrivate *d_ptr; | QGeoMapCircleObjectPrivate *d_ptr; | |||
Q_DECLARE_PRIVATE(QGeoMapCircleObject) | Q_DECLARE_PRIVATE(QGeoMapCircleObject) | |||
Q_DISABLE_COPY(QGeoMapCircleObject) | Q_DISABLE_COPY(QGeoMapCircleObject) | |||
End of changes. 6 change blocks. | ||||
14 lines changed or deleted | 20 lines changed or added | |||
qgeomapdata.h | qgeomapdata.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOMAPDATA_H | #ifndef QGEOMAPDATA_H | |||
#define QGEOMAPDATA_H | #define QGEOMAPDATA_H | |||
#include "qgraphicsgeomap.h" | #include "qgraphicsgeomap.h" | |||
#include <QObject> | #include <QObject> | |||
skipping to change at line 59 | skipping to change at line 59 | |||
#include <QRectF> | #include <QRectF> | |||
#include <QPainter> | #include <QPainter> | |||
#include <QStyleOptionGraphicsItem> | #include <QStyleOptionGraphicsItem> | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
class QGeoCoordinate; | class QGeoCoordinate; | |||
class QGeoBoundingBox; | class QGeoBoundingBox; | |||
class QGeoMappingManagerEngine; | class QGeoMappingManagerEngine; | |||
class QGeoMapObject; | class QGeoMapObject; | |||
class QGeoMapObjectInfo; | class QGeoMapGroupObject; | |||
class QGeoMapDataPrivate; | class QGeoMapDataPrivate; | |||
class QGeoMapOverlay; | class QGeoMapOverlay; | |||
class QGeoMapObjectInfo; | ||||
class Q_LOCATION_EXPORT QGeoMapData : public QObject | class Q_LOCATION_EXPORT QGeoMapData : public QObject | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
Q_PROPERTY(QSizeF windowSize READ windowSize WRITE setWindowSize NOTIFY windowSizeChanged) | Q_PROPERTY(QSizeF windowSize READ windowSize WRITE setWindowSize NOTIFY windowSizeChanged) | |||
Q_PROPERTY(qreal zoomLevel READ zoomLevel WRITE setZoomLevel NOTIFY zoo mLevelChanged) | Q_PROPERTY(qreal zoomLevel READ zoomLevel WRITE setZoomLevel NOTIFY zoo mLevelChanged) | |||
Q_PROPERTY(QGraphicsGeoMap::MapType mapType READ mapType WRITE setMapTy pe NOTIFY mapTypeChanged) | Q_PROPERTY(QGraphicsGeoMap::MapType mapType READ mapType WRITE setMapTy pe NOTIFY mapTypeChanged) | |||
Q_PROPERTY(QGraphicsGeoMap::ConnectivityMode connectivityMode READ conn ectivityMode WRITE setConnectivityMode NOTIFY connectivityModeChanged) | Q_PROPERTY(QGraphicsGeoMap::ConnectivityMode connectivityMode READ conn ectivityMode WRITE setConnectivityMode NOTIFY connectivityModeChanged) | |||
Q_PROPERTY(QGeoCoordinate center READ center WRITE setCenter NOTIFY cen terChanged) | Q_PROPERTY(QGeoCoordinate center READ center WRITE setCenter NOTIFY cen terChanged) | |||
Q_PROPERTY(qreal tilt READ tilt WRITE setTilt NOTIFY tiltChanged) | ||||
Q_PROPERTY(qreal minimumTilt READ minimumTilt CONSTANT) | ||||
Q_PROPERTY(qreal maximumTilt READ maximumTilt CONSTANT) | ||||
Q_PROPERTY(bool supportsTilting READ supportsTilting CONSTANT) | ||||
Q_PROPERTY(qreal bearing READ bearing WRITE setBearing NOTIFY bearingCh | ||||
anged) | ||||
Q_PROPERTY(bool supportsBearing READ supportsBearing CONSTANT) | ||||
public: | public: | |||
QGeoMapData(QGeoMappingManagerEngine *engine); | QGeoMapData(QGeoMappingManagerEngine *engine); | |||
virtual ~QGeoMapData(); | virtual ~QGeoMapData(); | |||
virtual void init(); | virtual void init(); | |||
virtual void setWindowSize(const QSizeF &size); | virtual void setWindowSize(const QSizeF &size); | |||
virtual QSizeF windowSize() const; | virtual QSizeF windowSize() const; | |||
virtual void setZoomLevel(qreal zoomLevel); | virtual void setZoomLevel(qreal zoomLevel); | |||
virtual qreal zoomLevel() const; | virtual qreal zoomLevel() const; | |||
bool supportsBearing() const; | ||||
void setBearing(qreal bearing); | ||||
qreal bearing() const; | ||||
bool supportsTilting() const; | ||||
void setTilt(qreal tilt); | ||||
qreal tilt() const; | ||||
qreal minimumTilt() const; | ||||
qreal maximumTilt() const; | ||||
virtual void pan(int dx, int dy); | virtual void pan(int dx, int dy); | |||
virtual void setCenter(const QGeoCoordinate ¢er); | virtual void setCenter(const QGeoCoordinate ¢er); | |||
virtual QGeoCoordinate center() const; | virtual QGeoCoordinate center() const; | |||
virtual void setMapType(QGraphicsGeoMap::MapType mapType); | virtual void setMapType(QGraphicsGeoMap::MapType mapType); | |||
virtual QGraphicsGeoMap::MapType mapType() const; | virtual QGraphicsGeoMap::MapType mapType() const; | |||
virtual void setConnectivityMode(QGraphicsGeoMap::ConnectivityMode conn ectivityMode); | virtual void setConnectivityMode(QGraphicsGeoMap::ConnectivityMode conn ectivityMode); | |||
virtual QGraphicsGeoMap::ConnectivityMode connectivityMode() const; | virtual QGraphicsGeoMap::ConnectivityMode connectivityMode() const; | |||
skipping to change at line 140 | skipping to change at line 157 | |||
QGeoMapDataPrivate* d_ptr; | QGeoMapDataPrivate* d_ptr; | |||
Q_SIGNALS: | Q_SIGNALS: | |||
void windowSizeChanged(const QSizeF &windowSize); | void windowSizeChanged(const QSizeF &windowSize); | |||
void zoomLevelChanged(qreal zoomLevel); | void zoomLevelChanged(qreal zoomLevel); | |||
void centerChanged(const QGeoCoordinate &coordinate); | void centerChanged(const QGeoCoordinate &coordinate); | |||
void mapTypeChanged(QGraphicsGeoMap::MapType mapType); | void mapTypeChanged(QGraphicsGeoMap::MapType mapType); | |||
void connectivityModeChanged(QGraphicsGeoMap::ConnectivityMode connecti vityMode); | void connectivityModeChanged(QGraphicsGeoMap::ConnectivityMode connecti vityMode); | |||
void updateMapDisplay(const QRectF &target = QRectF()); | void updateMapDisplay(const QRectF &target = QRectF()); | |||
void bearingChanged(qreal bearing); | ||||
void tiltChanged(qreal tilt); | ||||
private: | private: | |||
Q_DECLARE_PRIVATE(QGeoMapData) | Q_DECLARE_PRIVATE(QGeoMapData) | |||
Q_DISABLE_COPY(QGeoMapData) | Q_DISABLE_COPY(QGeoMapData) | |||
friend class QGeoMapObject; | friend class QGeoMapObject; | |||
friend class QGeoMapObjectInfo; | friend class QGeoMapObjectInfo; | |||
friend class QGeoMapGroupObject; | ||||
}; | }; | |||
QTM_END_NAMESPACE | QTM_END_NAMESPACE | |||
#endif | #endif | |||
End of changes. 9 change blocks. | ||||
15 lines changed or deleted | 36 lines changed or added | |||
qgeomapgroupobject.h | qgeomapgroupobject.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOMAPGROUPOBJECT_H | #ifndef QGEOMAPGROUPOBJECT_H | |||
#define QGEOMAPGROUPOBJECT_H | #define QGEOMAPGROUPOBJECT_H | |||
#include "qgeomapobject.h" | #include "qgeomapobject.h" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
skipping to change at line 70 | skipping to change at line 70 | |||
QGeoMapObject::Type type() const; | QGeoMapObject::Type type() const; | |||
QGeoBoundingBox boundingBox() const; | QGeoBoundingBox boundingBox() const; | |||
bool contains(const QGeoCoordinate &coordinate) const; | bool contains(const QGeoCoordinate &coordinate) const; | |||
QList<QGeoMapObject*> childObjects() const; | QList<QGeoMapObject*> childObjects() const; | |||
void addChildObject(QGeoMapObject *childObject); | void addChildObject(QGeoMapObject *childObject); | |||
void removeChildObject(QGeoMapObject *childObject); | void removeChildObject(QGeoMapObject *childObject); | |||
void clearChildObjects(); | void clearChildObjects(); | |||
void setVisible(bool visible); | ||||
void setMapData(QGeoMapData *mapData); | void setMapData(QGeoMapData *mapData); | |||
Q_SIGNALS: | Q_SIGNALS: | |||
void childAdded(QGeoMapObject *childObject); | void childAdded(QGeoMapObject *childObject); | |||
void childUpdated(QGeoMapObject *childObject); | ||||
void childRemoved(QGeoMapObject *childObject); | void childRemoved(QGeoMapObject *childObject); | |||
private: | private: | |||
QGeoMapGroupObjectPrivate *d_ptr; | QGeoMapGroupObjectPrivate *d_ptr; | |||
Q_DECLARE_PRIVATE(QGeoMapGroupObject) | Q_DECLARE_PRIVATE(QGeoMapGroupObject) | |||
Q_DISABLE_COPY(QGeoMapGroupObject) | Q_DISABLE_COPY(QGeoMapGroupObject) | |||
}; | }; | |||
QTM_END_NAMESPACE | QTM_END_NAMESPACE | |||
End of changes. 5 change blocks. | ||||
14 lines changed or deleted | 17 lines changed or added | |||
qgeomapobject.h | qgeomapobject.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOMAPOBJECT_H | #ifndef QGEOMAPOBJECT_H | |||
#define QGEOMAPOBJECT_H | #define QGEOMAPOBJECT_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include <QList> | #include <QList> | |||
#include <QObject> | #include <QObject> | |||
class QPainter; | class QPainter; | |||
class QRectF; | class QRectF; | |||
class QGraphicsItem; | ||||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
class QGeoCoordinate; | class QGeoCoordinate; | |||
class QGeoBoundingBox; | class QGeoBoundingBox; | |||
class QGeoMapObjectPrivate; | class QGeoMapObjectPrivate; | |||
class QGeoMapContainer; | class QGeoMapContainer; | |||
class QGeoMapObjectInfo; | class QGeoMapObjectInfo; | |||
class QGeoMapData; | class QGeoMapData; | |||
class Q_LOCATION_EXPORT QGeoMapObject : public QObject | class Q_LOCATION_EXPORT QGeoMapObject : public QObject | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
Q_PROPERTY(int zValue READ zValue WRITE setZValue NOTIFY zValueChanged) | Q_PROPERTY(int zValue READ zValue WRITE setZValue NOTIFY zValueChanged) | |||
Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleC hanged) | Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleC hanged) | |||
Q_PROPERTY(bool selected READ isSelected WRITE setSelected NOTIFY selec tedChanged) | Q_PROPERTY(bool selected READ isSelected WRITE setSelected NOTIFY selec tedChanged) | |||
Q_PROPERTY(QGeoCoordinate origin READ origin NOTIFY originChanged) | ||||
Q_PROPERTY(CoordinateUnit units READ units NOTIFY unitsChanged) | ||||
Q_PROPERTY(TransformType transformType READ transformType NOTIFY transf | ||||
ormTypeChanged) | ||||
public: | public: | |||
enum Type { | enum Type { | |||
NullType, | NullType, | |||
GroupType, | GroupType, | |||
RectangleType, | RectangleType, | |||
CircleType, | CircleType, | |||
PolylineType, | PolylineType, | |||
PolygonType, | PolygonType, | |||
PixmapType, | PixmapType, | |||
TextType, | TextType, | |||
RouteType | RouteType, | |||
CustomType | ||||
}; | ||||
enum CoordinateUnit { | ||||
PixelUnit, | ||||
MeterUnit, | ||||
RelativeArcSecondUnit, | ||||
AbsoluteArcSecondUnit | ||||
}; | ||||
enum TransformType { | ||||
BilinearTransform, | ||||
ExactTransform | ||||
}; | }; | |||
QGeoMapObject(QGeoMapData *mapData = 0); | QGeoMapObject(QGeoMapData *mapData = 0); | |||
virtual ~QGeoMapObject(); | virtual ~QGeoMapObject(); | |||
virtual Type type() const; | virtual Type type() const; | |||
void setZValue(int zValue); | void setZValue(int zValue); | |||
int zValue() const; | int zValue() const; | |||
skipping to change at line 106 | skipping to change at line 123 | |||
virtual QGeoBoundingBox boundingBox() const; | virtual QGeoBoundingBox boundingBox() const; | |||
virtual bool contains(const QGeoCoordinate &coordinate) const; | virtual bool contains(const QGeoCoordinate &coordinate) const; | |||
bool operator<(const QGeoMapObject &other) const; | bool operator<(const QGeoMapObject &other) const; | |||
bool operator>(const QGeoMapObject &other) const; | bool operator>(const QGeoMapObject &other) const; | |||
virtual void setMapData(QGeoMapData *mapData); | virtual void setMapData(QGeoMapData *mapData); | |||
virtual QGeoMapData* mapData() const; | virtual QGeoMapData* mapData() const; | |||
QGeoMapObjectInfo* info() const; | QGeoMapObjectInfo *info() const; | |||
QGeoCoordinate origin() const; | ||||
CoordinateUnit units() const; | ||||
TransformType transformType() const; | ||||
protected: | ||||
void setOrigin(const QGeoCoordinate &origin); | ||||
void setUnits(const CoordinateUnit &unit); | ||||
void setTransformType(const TransformType &type); | ||||
Q_SIGNALS: | Q_SIGNALS: | |||
void zValueChanged(int zValue); | void zValueChanged(int zValue); | |||
void visibleChanged(bool visible); | void visibleChanged(bool visible); | |||
void selectedChanged(bool selected); | void selectedChanged(bool selected); | |||
void originChanged(QGeoCoordinate origin); | ||||
void unitsChanged(QGeoMapObject::CoordinateUnit units); | ||||
void transformTypeChanged(QGeoMapObject::TransformType transformType); | ||||
private: | private: | |||
QGeoMapObjectPrivate *d_ptr; | QGeoMapObjectPrivate *d_ptr; | |||
Q_DECLARE_PRIVATE(QGeoMapObject) | Q_DECLARE_PRIVATE(QGeoMapObject) | |||
Q_DISABLE_COPY(QGeoMapObject) | Q_DISABLE_COPY(QGeoMapObject) | |||
friend class QGeoMapDataPrivate; | friend class QGeoMapDataPrivate; | |||
friend class QGeoMapGroupObject; | ||||
}; | }; | |||
QTM_END_NAMESPACE | QTM_END_NAMESPACE | |||
#endif | #endif | |||
End of changes. 9 change blocks. | ||||
16 lines changed or deleted | 48 lines changed or added | |||
qgeomapobjectinfo.h | qgeomapobjectinfo.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOMAPOBJECTINFO_H | #ifndef QGEOMAPOBJECTINFO_H | |||
#define QGEOMAPOBJECTINFO_H | #define QGEOMAPOBJECTINFO_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include "qgeomapobject.h" | ||||
#include <QObject> | #include <QObject> | |||
#include <QSizeF> | #include <QSizeF> | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
class QGeoCoordinate; | class QGeoCoordinate; | |||
class QGeoBoundingBox; | class QGeoBoundingBox; | |||
class QGeoMapData; | class QGeoMapData; | |||
skipping to change at line 80 | skipping to change at line 81 | |||
public slots: | public slots: | |||
virtual void windowSizeChanged(const QSizeF &windowSize); | virtual void windowSizeChanged(const QSizeF &windowSize); | |||
virtual void zoomLevelChanged(qreal zoomLevel); | virtual void zoomLevelChanged(qreal zoomLevel); | |||
virtual void centerChanged(const QGeoCoordinate &coordinate); | virtual void centerChanged(const QGeoCoordinate &coordinate); | |||
virtual void zValueChanged(int zValue); | virtual void zValueChanged(int zValue); | |||
virtual void visibleChanged(bool visible); | virtual void visibleChanged(bool visible); | |||
virtual void selectedChanged(bool selected); | virtual void selectedChanged(bool selected); | |||
virtual void originChanged(const QGeoCoordinate &origin); | ||||
virtual void unitsChanged(QGeoMapObject::CoordinateUnit units); | ||||
virtual void transformTypeChanged(QGeoMapObject::TransformType transfor | ||||
mType); | ||||
protected: | protected: | |||
QGeoMapData* mapData(); | QGeoMapData* mapData(); | |||
QGeoMapObject* mapObject(); | QGeoMapObject* mapObject(); | |||
QGeoMapObject* mapObject() const; | ||||
private: | private: | |||
QGeoMapObjectInfoPrivate *d_ptr; | QGeoMapObjectInfoPrivate *d_ptr; | |||
Q_DISABLE_COPY(QGeoMapObjectInfo) | Q_DISABLE_COPY(QGeoMapObjectInfo) | |||
}; | }; | |||
QTM_END_NAMESPACE | QTM_END_NAMESPACE | |||
#endif | #endif | |||
End of changes. 6 change blocks. | ||||
14 lines changed or deleted | 21 lines changed or added | |||
qgeomapoverlay.h | qgeomapoverlay.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOMAPOVERLAY_H | #ifndef QGEOMAPOVERLAY_H | |||
#define QGEOMAPOVERLAY_H | #define QGEOMAPOVERLAY_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include <QList> | #include <QList> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgeomappingmanager.h | qgeomappingmanager.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOMAPPINGMANAGER_H | #ifndef QGEOMAPPINGMANAGER_H | |||
#define QGEOMAPPINGMANAGER_H | #define QGEOMAPPINGMANAGER_H | |||
#include "qgraphicsgeomap.h" | #include "qgraphicsgeomap.h" | |||
#include <QObject> | #include <QObject> | |||
skipping to change at line 81 | skipping to change at line 81 | |||
int managerVersion() const; | int managerVersion() const; | |||
QGeoMapData* createMapData(); | QGeoMapData* createMapData(); | |||
QList<QGraphicsGeoMap::MapType> supportedMapTypes() const; | QList<QGraphicsGeoMap::MapType> supportedMapTypes() const; | |||
QList<QGraphicsGeoMap::ConnectivityMode> supportedConnectivityModes() c onst; | QList<QGraphicsGeoMap::ConnectivityMode> supportedConnectivityModes() c onst; | |||
qreal minimumZoomLevel() const; | qreal minimumZoomLevel() const; | |||
qreal maximumZoomLevel() const; | qreal maximumZoomLevel() const; | |||
bool supportsBearing() const; | ||||
bool supportsTilting() const; | ||||
qreal minimumTilt() const; | ||||
qreal maximumTilt() const; | ||||
bool supportsCustomMapObjects() const; | ||||
void setLocale(const QLocale &locale); | void setLocale(const QLocale &locale); | |||
QLocale locale() const; | QLocale locale() const; | |||
private: | private: | |||
QGeoMappingManager(QGeoMappingManagerEngine *engine, QObject *parent = 0); | QGeoMappingManager(QGeoMappingManagerEngine *engine, QObject *parent = 0); | |||
QGeoMappingManagerPrivate* d_ptr; | QGeoMappingManagerPrivate* d_ptr; | |||
Q_DISABLE_COPY(QGeoMappingManager) | Q_DISABLE_COPY(QGeoMappingManager) | |||
friend class QGeoServiceProvider; | friend class QGeoServiceProvider; | |||
End of changes. 4 change blocks. | ||||
14 lines changed or deleted | 22 lines changed or added | |||
qgeomappingmanagerengine.h | qgeomappingmanagerengine.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOMAPPINGMANAGERENGINE_H | #ifndef QGEOMAPPINGMANAGERENGINE_H | |||
#define QGEOMAPPINGMANAGERENGINE_H | #define QGEOMAPPINGMANAGERENGINE_H | |||
#include "qgraphicsgeomap.h" | #include "qgraphicsgeomap.h" | |||
#include <QObject> | #include <QObject> | |||
skipping to change at line 82 | skipping to change at line 82 | |||
int managerVersion() const; | int managerVersion() const; | |||
virtual QGeoMapData* createMapData() = 0; | virtual QGeoMapData* createMapData() = 0; | |||
QList<QGraphicsGeoMap::MapType> supportedMapTypes() const; | QList<QGraphicsGeoMap::MapType> supportedMapTypes() const; | |||
QList<QGraphicsGeoMap::ConnectivityMode> supportedConnectivityModes() c onst; | QList<QGraphicsGeoMap::ConnectivityMode> supportedConnectivityModes() c onst; | |||
qreal minimumZoomLevel() const; | qreal minimumZoomLevel() const; | |||
qreal maximumZoomLevel() const; | qreal maximumZoomLevel() const; | |||
bool supportsBearing() const; | ||||
bool supportsTilting() const; | ||||
qreal minimumTilt() const; | ||||
qreal maximumTilt() const; | ||||
bool supportsCustomMapObjects() const; | ||||
void setLocale(const QLocale &locale); | void setLocale(const QLocale &locale); | |||
QLocale locale() const; | QLocale locale() const; | |||
protected: | protected: | |||
QGeoMappingManagerEngine(QGeoMappingManagerEnginePrivate *dd, QObject * parent = 0); | QGeoMappingManagerEngine(QGeoMappingManagerEnginePrivate *dd, QObject * parent = 0); | |||
void setSupportedMapTypes(const QList<QGraphicsGeoMap::MapType> &mapTyp es); | void setSupportedMapTypes(const QList<QGraphicsGeoMap::MapType> &mapTyp es); | |||
void setSupportedConnectivityModes(const QList<QGraphicsGeoMap::Connect ivityMode> &connectivityModes); | void setSupportedConnectivityModes(const QList<QGraphicsGeoMap::Connect ivityMode> &connectivityModes); | |||
void setMinimumZoomLevel(qreal minimumZoom); | void setMinimumZoomLevel(qreal minimumZoom); | |||
void setMaximumZoomLevel(qreal maximumZoom); | void setMaximumZoomLevel(qreal maximumZoom); | |||
void setMaximumTilt(qreal maximumTilt); | ||||
void setMinimumTilt(qreal minimumTilt); | ||||
void setSupportsBearing(bool supportsBearing); | ||||
void setSupportsTilting(bool supportsTilting); | ||||
void setSupportsCustomMapObjects(bool supportsCustomMapObjects); | ||||
QGeoMappingManagerEnginePrivate* d_ptr; | QGeoMappingManagerEnginePrivate* d_ptr; | |||
private: | private: | |||
void setManagerName(const QString &managerName); | void setManagerName(const QString &managerName); | |||
void setManagerVersion(int managerVersion); | void setManagerVersion(int managerVersion); | |||
Q_DECLARE_PRIVATE(QGeoMappingManagerEngine) | Q_DECLARE_PRIVATE(QGeoMappingManagerEngine) | |||
Q_DISABLE_COPY(QGeoMappingManagerEngine) | Q_DISABLE_COPY(QGeoMappingManagerEngine) | |||
friend class QGeoServiceProvider; | friend class QGeoServiceProvider; | |||
End of changes. 5 change blocks. | ||||
14 lines changed or deleted | 30 lines changed or added | |||
qgeomappixmapobject.h | qgeomappixmapobject.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOMAPPIXMAPOBJECT_H | #ifndef QGEOMAPPIXMAPOBJECT_H | |||
#define QGEOMAPPIXMAPOBJECT_H | #define QGEOMAPPIXMAPOBJECT_H | |||
#include "qgeomapobject.h" | #include "qgeomapobject.h" | |||
#include "qgeocoordinate.h" | #include "qgeocoordinate.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgeomappolygonobject.h | qgeomappolygonobject.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOMAPPOLYGONOBJECT_H | #ifndef QGEOMAPPOLYGONOBJECT_H | |||
#define QGEOMAPPOLYGONOBJECT_H | #define QGEOMAPPOLYGONOBJECT_H | |||
#include "qgeomapobject.h" | #include "qgeomapobject.h" | |||
#include <QList> | #include <QList> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgeomappolylineobject.h | qgeomappolylineobject.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOMAPPOLYLINEOBJECT_H | #ifndef QGEOMAPPOLYLINEOBJECT_H | |||
#define QGEOMAPPOLYLINEOBJECT_H | #define QGEOMAPPOLYLINEOBJECT_H | |||
#include "qgeomapobject.h" | #include "qgeomapobject.h" | |||
#include <QList> | #include <QList> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgeomaprectangleobject.h | qgeomaprectangleobject.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOMAPRECTANGLEOBJECT_H | #ifndef QGEOMAPRECTANGLEOBJECT_H | |||
#define QGEOMAPRECTANGLEOBJECT_H | #define QGEOMAPRECTANGLEOBJECT_H | |||
#include "qgeomapobject.h" | #include "qgeomapobject.h" | |||
#include <QPen> | #include <QPen> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgeomaprouteobject.h | qgeomaprouteobject.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOMAPROUTEOBJECT_H | #ifndef QGEOMAPROUTEOBJECT_H | |||
#define QGEOMAPROUTEOBJECT_H | #define QGEOMAPROUTEOBJECT_H | |||
#include "qgeomapobject.h" | #include "qgeomapobject.h" | |||
#include "qgeoroute.h" | #include "qgeoroute.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgeomaptextobject.h | qgeomaptextobject.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOMAPTEXTOBJECT_H | #ifndef QGEOMAPTEXTOBJECT_H | |||
#define QGEOMAPTEXTOBJECT_H | #define QGEOMAPTEXTOBJECT_H | |||
#include "qgeomapobject.h" | #include "qgeomapobject.h" | |||
#include "qgeocoordinate.h" | #include "qgeocoordinate.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgeoplace.h | qgeoplace.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOPLACE_H | #ifndef QGEOPLACE_H | |||
#define QGEOPLACE_H | #define QGEOPLACE_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include <QSharedDataPointer> | #include <QSharedDataPointer> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgeopositioninfo.h | qgeopositioninfo.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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" | |||
#include <QDateTime> | #include <QDateTime> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgeopositioninfosource.h | qgeopositioninfosource.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOPOSITIONINFOSOURCE_H | #ifndef QGEOPOSITIONINFOSOURCE_H | |||
#define QGEOPOSITIONINFOSOURCE_H | #define QGEOPOSITIONINFOSOURCE_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include "qgeopositioninfo.h" | #include "qgeopositioninfo.h" | |||
#include <QObject> | #include <QObject> | |||
skipping to change at line 83 | skipping to change at line 83 | |||
virtual void setPreferredPositioningMethods(PositioningMethods methods) ; | virtual void setPreferredPositioningMethods(PositioningMethods methods) ; | |||
PositioningMethods preferredPositioningMethods() const; | PositioningMethods preferredPositioningMethods() const; | |||
virtual QGeoPositionInfo lastKnownPosition(bool fromSatellitePositionin gMethodsOnly = false) const = 0; | virtual QGeoPositionInfo lastKnownPosition(bool fromSatellitePositionin gMethodsOnly = false) const = 0; | |||
virtual PositioningMethods supportedPositioningMethods() const = 0; | virtual PositioningMethods supportedPositioningMethods() const = 0; | |||
virtual int minimumUpdateInterval() const = 0; | virtual int minimumUpdateInterval() const = 0; | |||
static QGeoPositionInfoSource *createDefaultSource(QObject *parent); | static QGeoPositionInfoSource *createDefaultSource(QObject *parent); | |||
static QGeoPositionInfoSource *createSource(const QString &sourceName, | ||||
QObject *parent); | ||||
static QStringList availableSources(); | ||||
public Q_SLOTS: | public Q_SLOTS: | |||
virtual void startUpdates() = 0; | virtual void startUpdates() = 0; | |||
virtual void stopUpdates() = 0; | virtual void stopUpdates() = 0; | |||
virtual void requestUpdate(int timeout = 0) = 0; | virtual void requestUpdate(int timeout = 0) = 0; | |||
Q_SIGNALS: | Q_SIGNALS: | |||
void positionUpdated(const QGeoPositionInfo &update); | void positionUpdated(const QGeoPositionInfo &update); | |||
void updateTimeout(); | void updateTimeout(); | |||
End of changes. 4 change blocks. | ||||
14 lines changed or deleted | 17 lines changed or added | |||
qgeoroute.h | qgeoroute.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOROUTE_H | #ifndef QGEOROUTE_H | |||
#define QGEOROUTE_H | #define QGEOROUTE_H | |||
#include "qgeocoordinate.h" | #include "qgeocoordinate.h" | |||
#include "qgeorouterequest.h" | #include "qgeorouterequest.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgeoroutereply.h | qgeoroutereply.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOROUTEREPLY_H | #ifndef QGEOROUTEREPLY_H | |||
#define QGEOROUTEREPLY_H | #define QGEOROUTEREPLY_H | |||
#include "qgeoroute.h" | #include "qgeoroute.h" | |||
#include <QList> | #include <QList> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgeorouterequest.h | qgeorouterequest.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOROUTEREQUEST_H | #ifndef QGEOROUTEREQUEST_H | |||
#define QGEOROUTEREQUEST_H | #define QGEOROUTEREQUEST_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include <QList> | #include <QList> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgeoroutesegment.h | qgeoroutesegment.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOROUTESEGMENT_H | #ifndef QGEOROUTESEGMENT_H | |||
#define QGEOROUTESEGMENT_H | #define QGEOROUTESEGMENT_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include <QExplicitlySharedDataPointer> | #include <QExplicitlySharedDataPointer> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgeoroutingmanager.h | qgeoroutingmanager.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOROUTINGMANAGER_H | #ifndef QGEOROUTINGMANAGER_H | |||
#define QGEOROUTINGMANAGER_H | #define QGEOROUTINGMANAGER_H | |||
#include "qgeorouterequest.h" | #include "qgeorouterequest.h" | |||
#include "qgeoroutereply.h" | #include "qgeoroutereply.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgeoroutingmanagerengine.h | qgeoroutingmanagerengine.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOROUTINGMANAGERENGINE_H | #ifndef QGEOROUTINGMANAGERENGINE_H | |||
#define QGEOROUTINGMANAGERENGINE_H | #define QGEOROUTINGMANAGERENGINE_H | |||
#include "qgeorouterequest.h" | #include "qgeorouterequest.h" | |||
#include "qgeoroutereply.h" | #include "qgeoroutereply.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgeosatelliteinfo.h | qgeosatelliteinfo.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOSATELLITEINFO_H | #ifndef QGEOSATELLITEINFO_H | |||
#define QGEOSATELLITEINFO_H | #define QGEOSATELLITEINFO_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
QT_BEGIN_NAMESPACE | QT_BEGIN_NAMESPACE | |||
class QDebug; | class QDebug; | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgeosatelliteinfosource.h | qgeosatelliteinfosource.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOSATELLITEINFOSOURCE_H | #ifndef QGEOSATELLITEINFOSOURCE_H | |||
#define QGEOSATELLITEINFOSOURCE_H | #define QGEOSATELLITEINFOSOURCE_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include "qgeosatelliteinfo.h" | #include "qgeosatelliteinfo.h" | |||
#include <QObject> | #include <QObject> | |||
skipping to change at line 62 | skipping to change at line 62 | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
class QGeoSatelliteInfoSourcePrivate; | class QGeoSatelliteInfoSourcePrivate; | |||
class Q_LOCATION_EXPORT QGeoSatelliteInfoSource : public QObject | class Q_LOCATION_EXPORT QGeoSatelliteInfoSource : public QObject | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
public: | public: | |||
explicit QGeoSatelliteInfoSource(QObject *parent); | explicit QGeoSatelliteInfoSource(QObject *parent); | |||
static QGeoSatelliteInfoSource *createDefaultSource(QObject *parent); | static QGeoSatelliteInfoSource *createDefaultSource(QObject *parent); | |||
static QGeoSatelliteInfoSource *createSource(const QString &sourceName, | ||||
QObject *parent); | ||||
static QStringList availableSources(); | ||||
public Q_SLOTS: | public Q_SLOTS: | |||
virtual void startUpdates() = 0; | virtual void startUpdates() = 0; | |||
virtual void stopUpdates() = 0; | virtual void stopUpdates() = 0; | |||
virtual void requestUpdate(int timeout = 0) = 0; | virtual void requestUpdate(int timeout = 0) = 0; | |||
Q_SIGNALS: | Q_SIGNALS: | |||
void satellitesInViewUpdated(const QList<QGeoSatelliteInfo> &satellites ); | void satellitesInViewUpdated(const QList<QGeoSatelliteInfo> &satellites ); | |||
void satellitesInUseUpdated(const QList<QGeoSatelliteInfo> &satellites) ; | void satellitesInUseUpdated(const QList<QGeoSatelliteInfo> &satellites) ; | |||
End of changes. 4 change blocks. | ||||
14 lines changed or deleted | 17 lines changed or added | |||
qgeosearchmanager.h | qgeosearchmanager.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOSEARCHMANAGER_H | #ifndef QGEOSEARCHMANAGER_H | |||
#define QGEOSEARCHMANAGER_H | #define QGEOSEARCHMANAGER_H | |||
#include "qgeosearchreply.h" | #include "qgeosearchreply.h" | |||
#include "qgeoboundingbox.h" | #include "qgeoboundingbox.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgeosearchmanagerengine.h | qgeosearchmanagerengine.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOSEARCHMANAGERENGINE_H | #ifndef QGEOSEARCHMANAGERENGINE_H | |||
#define QGEOSEARCHMANAGERENGINE_H | #define QGEOSEARCHMANAGERENGINE_H | |||
#include "qgeosearchmanager.h" | #include "qgeosearchmanager.h" | |||
#include "qgeosearchreply.h" | #include "qgeosearchreply.h" | |||
#include "qgeoboundingbox.h" | #include "qgeoboundingbox.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgeosearchreply.h | qgeosearchreply.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOSEARCHREPLY_H | #ifndef QGEOSEARCHREPLY_H | |||
#define QGEOSEARCHREPLY_H | #define QGEOSEARCHREPLY_H | |||
#include "qgeoplace.h" | #include "qgeoplace.h" | |||
#include <QObject> | #include <QObject> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgeoserviceprovider.h | qgeoserviceprovider.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOSERVICEPROVIDER_H | #ifndef QGEOSERVICEPROVIDER_H | |||
#define QGEOSERVICEPROVIDER_H | #define QGEOSERVICEPROVIDER_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include <QMap> | #include <QMap> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgeoserviceproviderfactory.h | qgeoserviceproviderfactory.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOSERVICEPROVIDERFACTORY_H | #ifndef QGEOSERVICEPROVIDERFACTORY_H | |||
#define QGEOSERVICEPROVIDERFACTORY_H | #define QGEOSERVICEPROVIDERFACTORY_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include "qgeoserviceprovider.h" | #include "qgeoserviceprovider.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgeotiledmapdata.h | qgeotiledmapdata.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOTILEDMAPDATA_H | #ifndef QGEOTILEDMAPDATA_H | |||
#define QGEOTILEDMAPDATA_H | #define QGEOTILEDMAPDATA_H | |||
#include "qgeomapdata.h" | #include "qgeomapdata.h" | |||
#include "qgeotiledmapreply.h" | #include "qgeotiledmapreply.h" | |||
skipping to change at line 73 | skipping to change at line 73 | |||
void setZoomLevel(qreal zoomLevel); | void setZoomLevel(qreal zoomLevel); | |||
void pan(int dx, int dy); | void pan(int dx, int dy); | |||
void setCenter(const QGeoCoordinate ¢er); | void setCenter(const QGeoCoordinate ¢er); | |||
QGeoCoordinate center() const; | QGeoCoordinate center() const; | |||
void setMapType(QGraphicsGeoMap::MapType mapType); | void setMapType(QGraphicsGeoMap::MapType mapType); | |||
void setConnectivityMode(QGraphicsGeoMap::ConnectivityMode connectivity | ||||
Mode); | ||||
virtual QGeoBoundingBox viewport() const; | virtual QGeoBoundingBox viewport() const; | |||
virtual void fitInViewport(const QGeoBoundingBox &bounds, bool preserve ViewportCenter = false); | virtual void fitInViewport(const QGeoBoundingBox &bounds, bool preserve ViewportCenter = false); | |||
QList<QGeoMapObject*> mapObjectsAtScreenPosition(const QPointF &screenP osition) const; | QList<QGeoMapObject*> mapObjectsAtScreenPosition(const QPointF &screenP osition) const; | |||
QList<QGeoMapObject*> mapObjectsInScreenRect(const QRectF &screenRect) const; | QList<QGeoMapObject*> mapObjectsInScreenRect(const QRectF &screenRect) const; | |||
QPointF coordinateToScreenPosition(const QGeoCoordinate &coordinate) co nst; | QPointF coordinateToScreenPosition(const QGeoCoordinate &coordinate) co nst; | |||
QGeoCoordinate screenPositionToCoordinate(const QPointF &screenPosition ) const; | QGeoCoordinate screenPositionToCoordinate(const QPointF &screenPosition ) const; | |||
virtual QPoint coordinateToWorldReferencePosition(const QGeoCoordinate &coordinate) const; | virtual QPoint coordinateToWorldReferencePosition(const QGeoCoordinate &coordinate) const; | |||
End of changes. 4 change blocks. | ||||
14 lines changed or deleted | 17 lines changed or added | |||
qgeotiledmappingmanagerengine.h | qgeotiledmappingmanagerengine.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOTILEDMAPPINGMANAGERENGINE_H | #ifndef QGEOTILEDMAPPINGMANAGERENGINE_H | |||
#define QGEOTILEDMAPPINGMANAGERENGINE_H | #define QGEOTILEDMAPPINGMANAGERENGINE_H | |||
#include "qgeomappingmanagerengine.h" | #include "qgeomappingmanagerengine.h" | |||
#include "qgeotiledmapreply.h" | #include "qgeotiledmapreply.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgeotiledmapreply.h | qgeotiledmapreply.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOTILEDMAPREPLY_H | #ifndef QGEOTILEDMAPREPLY_H | |||
#define QGEOTILEDMAPREPLY_H | #define QGEOTILEDMAPREPLY_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include <QObject> | #include <QObject> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgeotiledmaprequest.h | qgeotiledmaprequest.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGEOTILEDMAPREQUEST_H | #ifndef QGEOTILEDMAPREQUEST_H | |||
#define QGEOTILEDMAPREQUEST_H | #define QGEOTILEDMAPREQUEST_H | |||
#include "qgraphicsgeomap.h" | #include "qgraphicsgeomap.h" | |||
#include <QRect> | #include <QRect> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qgraphicsgeomap.h | qgraphicsgeomap.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QGRAPHICSGEOMAP_H | #ifndef QGRAPHICSGEOMAP_H | |||
#define QGRAPHICSGEOMAP_H | #define QGRAPHICSGEOMAP_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include <QGraphicsWidget> | #include <QGraphicsWidget> | |||
skipping to change at line 70 | skipping to change at line 70 | |||
Q_OBJECT | Q_OBJECT | |||
Q_ENUMS(MapType) | Q_ENUMS(MapType) | |||
Q_ENUMS(ConnectivityMode) | Q_ENUMS(ConnectivityMode) | |||
Q_PROPERTY(qreal minimumZoomLevel READ minimumZoomLevel CONSTANT) | Q_PROPERTY(qreal minimumZoomLevel READ minimumZoomLevel CONSTANT) | |||
Q_PROPERTY(qreal maximumZoomLevel READ maximumZoomLevel CONSTANT) | Q_PROPERTY(qreal maximumZoomLevel READ maximumZoomLevel CONSTANT) | |||
Q_PROPERTY(qreal zoomLevel READ zoomLevel WRITE setZoomLevel NOTIFY zoo mLevelChanged) | Q_PROPERTY(qreal zoomLevel READ zoomLevel WRITE setZoomLevel NOTIFY zoo mLevelChanged) | |||
Q_PROPERTY(MapType mapType READ mapType WRITE setMapType NOTIFY mapType Changed) | Q_PROPERTY(MapType mapType READ mapType WRITE setMapType NOTIFY mapType Changed) | |||
Q_PROPERTY(QGeoCoordinate center READ center WRITE setCenter NOTIFY cen terChanged) | Q_PROPERTY(QGeoCoordinate center READ center WRITE setCenter NOTIFY cen terChanged) | |||
Q_PROPERTY(ConnectivityMode connectivityMode READ connectivityMode WRIT E setConnectivityMode NOTIFY connectivityModeChanged) | Q_PROPERTY(ConnectivityMode connectivityMode READ connectivityMode WRIT E setConnectivityMode NOTIFY connectivityModeChanged) | |||
Q_PROPERTY(qreal minimumTilt READ minimumTilt CONSTANT) | ||||
Q_PROPERTY(qreal maximumTilt READ maximumTilt CONSTANT) | ||||
Q_PROPERTY(qreal tilt READ tilt WRITE setTilt NOTIFY tiltChanged) | ||||
Q_PROPERTY(bool supportsTilting READ supportsTilting CONSTANT) | ||||
Q_PROPERTY(qreal bearing READ bearing WRITE setBearing NOTIFY bearingCh | ||||
anged) | ||||
Q_PROPERTY(bool supportsBearing READ supportsBearing CONSTANT) | ||||
public: | public: | |||
enum MapType { | enum MapType { | |||
NoMap, | NoMap, | |||
StreetMap, | StreetMap, | |||
SatelliteMapDay, | SatelliteMapDay, | |||
SatelliteMapNight, | SatelliteMapNight, | |||
TerrainMap | TerrainMap | |||
}; | }; | |||
skipping to change at line 99 | skipping to change at line 105 | |||
QPainterPath shape() const; | QPainterPath shape() const; | |||
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, Q Widget *parent); | void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, Q Widget *parent); | |||
qreal minimumZoomLevel() const; | qreal minimumZoomLevel() const; | |||
qreal maximumZoomLevel() const; | qreal maximumZoomLevel() const; | |||
void setZoomLevel(qreal zoomLevel); | void setZoomLevel(qreal zoomLevel); | |||
qreal zoomLevel() const; | qreal zoomLevel() const; | |||
bool supportsBearing() const; | ||||
void setBearing(qreal bearing); | ||||
qreal bearing() const; | ||||
bool supportsTilting() const; | ||||
void setTilt(qreal tilt); | ||||
qreal tilt() const; | ||||
qreal minimumTilt() const; | ||||
qreal maximumTilt() const; | ||||
void setCenter(const QGeoCoordinate ¢er); | void setCenter(const QGeoCoordinate ¢er); | |||
QGeoCoordinate center() const; | QGeoCoordinate center() const; | |||
QList<MapType> supportedMapTypes() const; | QList<MapType> supportedMapTypes() const; | |||
void setMapType(MapType mapType); | void setMapType(MapType mapType); | |||
MapType mapType() const; | MapType mapType() const; | |||
QList<ConnectivityMode> supportedConnectivityModes() const; | QList<ConnectivityMode> supportedConnectivityModes() const; | |||
void setConnectivityMode(ConnectivityMode connectivityMode); | void setConnectivityMode(ConnectivityMode connectivityMode); | |||
ConnectivityMode connectivityMode() const; | ConnectivityMode connectivityMode() const; | |||
bool supportsCustomMapObjects() const; | ||||
QList<QGeoMapObject*> mapObjects() const; | QList<QGeoMapObject*> mapObjects() const; | |||
void addMapObject(QGeoMapObject *mapObject); | void addMapObject(QGeoMapObject *mapObject); | |||
void removeMapObject(QGeoMapObject *mapObject); | void removeMapObject(QGeoMapObject *mapObject); | |||
void clearMapObjects(); | void clearMapObjects(); | |||
QList<QGeoMapOverlay*> mapOverlays() const; | QList<QGeoMapOverlay*> mapOverlays() const; | |||
void addMapOverlay(QGeoMapOverlay *overlay); | void addMapOverlay(QGeoMapOverlay *overlay); | |||
void removeMapOverlay(QGeoMapOverlay *overlay); | void removeMapOverlay(QGeoMapOverlay *overlay); | |||
void clearMapOverlays(); | void clearMapOverlays(); | |||
skipping to change at line 141 | skipping to change at line 159 | |||
void pan(int dx, int dy); | void pan(int dx, int dy); | |||
protected: | protected: | |||
void resizeEvent(QGraphicsSceneResizeEvent *event); | void resizeEvent(QGraphicsSceneResizeEvent *event); | |||
Q_SIGNALS: | Q_SIGNALS: | |||
void zoomLevelChanged(qreal zoomLevel); | void zoomLevelChanged(qreal zoomLevel); | |||
void centerChanged(const QGeoCoordinate &coordinate); | void centerChanged(const QGeoCoordinate &coordinate); | |||
void mapTypeChanged(QGraphicsGeoMap::MapType mapType); | void mapTypeChanged(QGraphicsGeoMap::MapType mapType); | |||
void connectivityModeChanged(QGraphicsGeoMap::ConnectivityMode connecti vityMode); | void connectivityModeChanged(QGraphicsGeoMap::ConnectivityMode connecti vityMode); | |||
void bearingChanged(qreal bearing); | ||||
void tiltChanged(qreal tilt); | ||||
private Q_SLOTS: | private Q_SLOTS: | |||
void updateMapDisplay(const QRectF& target); | void updateMapDisplay(const QRectF& target); | |||
private: | private: | |||
QGraphicsGeoMapPrivate *d_ptr; | QGraphicsGeoMapPrivate *d_ptr; | |||
Q_DISABLE_COPY(QGraphicsGeoMap) | Q_DISABLE_COPY(QGraphicsGeoMap) | |||
}; | }; | |||
QTM_END_NAMESPACE | QTM_END_NAMESPACE | |||
End of changes. 7 change blocks. | ||||
14 lines changed or deleted | 35 lines changed or added | |||
qgraphicsvideoitem.h | qgraphicsvideoitem.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qimageencodercontrol.h | qimageencodercontrol.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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" | |||
#include "qmediarecorder.h" | #include "qmediarecorder.h" | |||
#include "qmediaencodersettings.h" | #include "qmediaencodersettings.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qlandmark.h | qlandmark.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QLANDMARK_H | #ifndef QLANDMARK_H | |||
#define QLANDMARK_H | #define QLANDMARK_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include <QObject> | #include <QObject> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qlandmarkabstractrequest.h | qlandmarkabstractrequest.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QLANDMARKABSTRACTREQUEST_H | #ifndef QLANDMARKABSTRACTREQUEST_H | |||
#define QLANDMARKABSTRACTREQUEST_H | #define QLANDMARKABSTRACTREQUEST_H | |||
#include "qlandmarkmanager.h" | #include "qlandmarkmanager.h" | |||
#include <QObject> | #include <QObject> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qlandmarkattributefilter.h | qlandmarkattributefilter.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QLANDMARKATTRIBUTEFILTER_H | #ifndef QLANDMARKATTRIBUTEFILTER_H | |||
#define QLANDMARKATTRIBUTEFILTER_H | #define QLANDMARKATTRIBUTEFILTER_H | |||
#include "qlandmarkfilter.h" | #include "qlandmarkfilter.h" | |||
#include <QVariant> | #include <QVariant> | |||
#include <QString> | #include <QString> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qlandmarkboxfilter.h | qlandmarkboxfilter.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QLANDMARKBOXFILTER_H | #ifndef QLANDMARKBOXFILTER_H | |||
#define QLANDMARKBOXFILTER_H | #define QLANDMARKBOXFILTER_H | |||
#include "qlandmarkfilter.h" | #include "qlandmarkfilter.h" | |||
#include "qgeocoordinate.h" | #include "qgeocoordinate.h" | |||
#include "qgeoboundingbox.h" | #include "qgeoboundingbox.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qlandmarkcategory.h | qlandmarkcategory.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QLANDMARKCATEGORY_H | #ifndef QLANDMARKCATEGORY_H | |||
#define QLANDMARKCATEGORY_H | #define QLANDMARKCATEGORY_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include <QVariant> | #include <QVariant> | |||
#include <QSharedDataPointer> | #include <QSharedDataPointer> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qlandmarkcategoryfetchbyidrequest.h | qlandmarkcategoryfetchbyidrequest.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QLANDMARKCATEGORYFETCHBYIDREQUEST_H | #ifndef QLANDMARKCATEGORYFETCHBYIDREQUEST_H | |||
#define QLANDMARKCATEGORYFETCHBYIDREQUEST_H | #define QLANDMARKCATEGORYFETCHBYIDREQUEST_H | |||
#include "qlandmarkabstractrequest.h" | #include "qlandmarkabstractrequest.h" | |||
#include "qlandmarkcategoryid.h" | #include "qlandmarkcategoryid.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qlandmarkcategoryfetchrequest.h | qlandmarkcategoryfetchrequest.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QLANDMARKCATEGORYFETCHREQUEST_H | #ifndef QLANDMARKCATEGORYFETCHREQUEST_H | |||
#define QLANDMARKCATEGORYFETCHREQUEST_H | #define QLANDMARKCATEGORYFETCHREQUEST_H | |||
#include "qlandmarkabstractrequest.h" | #include "qlandmarkabstractrequest.h" | |||
#include "qlandmarkcategoryid.h" | #include "qlandmarkcategoryid.h" | |||
#include "qlandmarknamesort.h" | #include "qlandmarknamesort.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qlandmarkcategoryfilter.h | qlandmarkcategoryfilter.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QLANDMARKCATEGORYFILTER_H | #ifndef QLANDMARKCATEGORYFILTER_H | |||
#define QLANDMARKCATEGORYFILTER_H | #define QLANDMARKCATEGORYFILTER_H | |||
#include "qlandmarkfilter.h" | #include "qlandmarkfilter.h" | |||
#include "qlandmarkcategoryid.h" | #include "qlandmarkcategoryid.h" | |||
#include "qlandmarkcategory.h" | #include "qlandmarkcategory.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qlandmarkcategoryid.h | qlandmarkcategoryid.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QLANDMARKCATEGORYID_H | #ifndef QLANDMARKCATEGORYID_H | |||
#define QLANDMARKCATEGORYID_H | #define QLANDMARKCATEGORYID_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include <QMetaType> | #include <QMetaType> | |||
#include <QSharedDataPointer> | #include <QSharedDataPointer> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qlandmarkcategoryidfetchrequest.h | qlandmarkcategoryidfetchrequest.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QLANDMARKCATEGORYIDFETCHREQUEST_H | #ifndef QLANDMARKCATEGORYIDFETCHREQUEST_H | |||
#define QLANDMARKCATEGORYIDFETCHREQUEST_H | #define QLANDMARKCATEGORYIDFETCHREQUEST_H | |||
#include "qlandmarkabstractrequest.h" | #include "qlandmarkabstractrequest.h" | |||
#include "qlandmarknamesort.h" | #include "qlandmarknamesort.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qlandmarkcategoryremoverequest.h | qlandmarkcategoryremoverequest.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QLANDMARKCATEGORYREMOVEREQUEST_H | #ifndef QLANDMARKCATEGORYREMOVEREQUEST_H | |||
#define QLANDMARKCATEGORYREMOVEREQUEST_H | #define QLANDMARKCATEGORYREMOVEREQUEST_H | |||
#include "qlandmarkabstractrequest.h" | #include "qlandmarkabstractrequest.h" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qlandmarkcategorysaverequest.h | qlandmarkcategorysaverequest.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QLANDMARKCATEGORYSAVEREQUEST_H | #ifndef QLANDMARKCATEGORYSAVEREQUEST_H | |||
#define QLANDMARKCATEGORYSAVEREQUEST_H | #define QLANDMARKCATEGORYSAVEREQUEST_H | |||
#include "qlandmarkabstractrequest.h" | #include "qlandmarkabstractrequest.h" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qlandmarkexportrequest.h | qlandmarkexportrequest.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QLANDMARKEXPORTREQUEST_H | #ifndef QLANDMARKEXPORTREQUEST_H | |||
#define QLANDMARKEXPORTREQUEST_H | #define QLANDMARKEXPORTREQUEST_H | |||
#include "qlandmarkabstractrequest.h" | #include "qlandmarkabstractrequest.h" | |||
class QIODevice; | class QIODevice; | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qlandmarkfetchbyidrequest.h | qlandmarkfetchbyidrequest.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QLANDMARKFETCHBYIDREQUEST_H | #ifndef QLANDMARKFETCHBYIDREQUEST_H | |||
#define QLANDMARKFETCHBYIDREQUEST_H | #define QLANDMARKFETCHBYIDREQUEST_H | |||
#include "qlandmarkabstractrequest.h" | #include "qlandmarkabstractrequest.h" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qlandmarkfetchrequest.h | qlandmarkfetchrequest.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QLANDMARKFETCHREQUEST_H | #ifndef QLANDMARKFETCHREQUEST_H | |||
#define QLANDMARKFETCHREQUEST_H | #define QLANDMARKFETCHREQUEST_H | |||
#include "qlandmarkabstractrequest.h" | #include "qlandmarkabstractrequest.h" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qlandmarkfilter.h | qlandmarkfilter.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QLANDMARKFILTER_H | #ifndef QLANDMARKFILTER_H | |||
#define QLANDMARKFILTER_H | #define QLANDMARKFILTER_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include <QSharedData> | #include <QSharedData> | |||
#include <Qt> | #include <Qt> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qlandmarkid.h | qlandmarkid.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QLANDMARKID_H | #ifndef QLANDMARKID_H | |||
#define QLANDMARKID_H | #define QLANDMARKID_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include <QMetaType> | #include <QMetaType> | |||
#include <QSharedDataPointer> | #include <QSharedDataPointer> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qlandmarkidfetchrequest.h | qlandmarkidfetchrequest.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QLANDMARKIDFETCHREQUEST_H | #ifndef QLANDMARKIDFETCHREQUEST_H | |||
#define QLANDMARKIDFETCHREQUEST_H | #define QLANDMARKIDFETCHREQUEST_H | |||
#include "qlandmarkabstractrequest.h" | #include "qlandmarkabstractrequest.h" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qlandmarkidfilter.h | qlandmarkidfilter.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QLANDMARKIDFILTER_H | #ifndef QLANDMARKIDFILTER_H | |||
#define QLANDMARKIDFILTER_H | #define QLANDMARKIDFILTER_H | |||
#include "qlandmarkid.h" | #include "qlandmarkid.h" | |||
#include "qlandmarkfilter.h" | #include "qlandmarkfilter.h" | |||
#include <QList> | #include <QList> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qlandmarkimportrequest.h | qlandmarkimportrequest.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QLANDMARKIMPORTREQUEST_H | #ifndef QLANDMARKIMPORTREQUEST_H | |||
#define QLANDMARKIMPORTREQUEST_H | #define QLANDMARKIMPORTREQUEST_H | |||
#include "qlandmarkabstractrequest.h" | #include "qlandmarkabstractrequest.h" | |||
class QIODevice; | class QIODevice; | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qlandmarkintersectionfilter.h | qlandmarkintersectionfilter.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QLANDMARKINTERSECTIONFILTER_H | #ifndef QLANDMARKINTERSECTIONFILTER_H | |||
#define QLANDMARKINTERSECTIONFILTER_H | #define QLANDMARKINTERSECTIONFILTER_H | |||
#include "qlandmarkfilter.h" | #include "qlandmarkfilter.h" | |||
#include <QList> | #include <QList> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qlandmarkmanager.h | qlandmarkmanager.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QLANDMARKMANAGER_H | #ifndef QLANDMARKMANAGER_H | |||
#define QLANDMARKMANAGER_H | #define QLANDMARKMANAGER_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include "qlandmarkid.h" | #include "qlandmarkid.h" | |||
#include "qlandmarkfilter.h" | #include "qlandmarkfilter.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qlandmarkmanagerengine.h | qlandmarkmanagerengine.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef Q_LANDMARKMANAGERENGINE_H | #ifndef Q_LANDMARKMANAGERENGINE_H | |||
#define Q_LANDMARKMANAGERENGINE_H | #define Q_LANDMARKMANAGERENGINE_H | |||
#include <QObject> | #include <QObject> | |||
#include <QMap> | #include <QMap> | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qlandmarkmanagerenginefactory.h | qlandmarkmanagerenginefactory.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QLANDMARKMANAGERENGINEFACTORY_H | #ifndef QLANDMARKMANAGERENGINEFACTORY_H | |||
#define QLANDMARKMANAGERENGINEFACTORY_H | #define QLANDMARKMANAGERENGINEFACTORY_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include "qlandmarkmanager.h" | #include "qlandmarkmanager.h" | |||
#include <QList> | #include <QList> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qlandmarknamefilter.h | qlandmarknamefilter.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QLANDMARKNAMEFILTER_H | #ifndef QLANDMARKNAMEFILTER_H | |||
#define QLANDMARKNAMEFILTER_H | #define QLANDMARKNAMEFILTER_H | |||
#include "qlandmarkfilter.h" | #include "qlandmarkfilter.h" | |||
#include "qnamespace.h" | #include "qnamespace.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qlandmarknamesort.h | qlandmarknamesort.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QLANDMARKNAMESORT_H | #ifndef QLANDMARKNAMESORT_H | |||
#define QLANDMARKNAMESORT_H | #define QLANDMARKNAMESORT_H | |||
#include "qlandmarksortorder.h" | #include "qlandmarksortorder.h" | |||
QT_BEGIN_HEADER | QT_BEGIN_HEADER | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qlandmarkproximityfilter.h | qlandmarkproximityfilter.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QLANDMARKPROXIMITY_H | #ifndef QLANDMARKPROXIMITY_H | |||
#define QLANDMARKPROXIMITY_H | #define QLANDMARKPROXIMITY_H | |||
#include "qlandmarkfilter.h" | #include "qlandmarkfilter.h" | |||
#include "qgeocoordinate.h" | #include "qgeocoordinate.h" | |||
#include "qgeoboundingcircle.h" | #include "qgeoboundingcircle.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qlandmarkremoverequest.h | qlandmarkremoverequest.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QLANDMARKREMOVEREQUEST_H | #ifndef QLANDMARKREMOVEREQUEST_H | |||
#define QLANDMARKREMOVEREQUEST_H | #define QLANDMARKREMOVEREQUEST_H | |||
#include "qlandmarkabstractrequest.h" | #include "qlandmarkabstractrequest.h" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qlandmarksaverequest.h | qlandmarksaverequest.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QLANDMARKSAVEREQUEST_H | #ifndef QLANDMARKSAVEREQUEST_H | |||
#define QLANDMARKSAVEREQUEST_H | #define QLANDMARKSAVEREQUEST_H | |||
#include "qlandmarkabstractrequest.h" | #include "qlandmarkabstractrequest.h" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qlandmarksortorder.h | qlandmarksortorder.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QLANDMARKSORTORDER_H | #ifndef QLANDMARKSORTORDER_H | |||
#define QLANDMARKSORTORDER_H | #define QLANDMARKSORTORDER_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include "qnamespace.h" | #include "qnamespace.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qlandmarkunionfilter.h | qlandmarkunionfilter.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QLANDMARKUNIONFILTER_H | #ifndef QLANDMARKUNIONFILTER_H | |||
#define QLANDMARKUNIONFILTER_H | #define QLANDMARKUNIONFILTER_H | |||
#include "qlandmarkfilter.h" | #include "qlandmarkfilter.h" | |||
#include <QList> | #include <QList> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qlatin1constant.h | qlatin1constant.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QLATIN1CONSTANT_H | #ifndef QLATIN1CONSTANT_H | |||
#define QLATIN1CONSTANT_H | #define QLATIN1CONSTANT_H | |||
#include <QString> | #include <QString> | |||
#include <QVariant> | #include <QVariant> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qlocalmediaplaylistprovider.h | qlocalmediaplaylistprovider.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QLOCALMEDIAPAYLISTPROVIDER_H | #ifndef QLOCALMEDIAPAYLISTPROVIDER_H | |||
#define QLOCALMEDIAPAYLISTPROVIDER_H | #define QLOCALMEDIAPAYLISTPROVIDER_H | |||
#include "qmediaplaylistprovider.h" | #include "qmediaplaylistprovider.h" | |||
QT_BEGIN_NAMESPACE | QT_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qmagnetometer.h | qmagnetometer.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qmediabindableinterface.h | qmediabindableinterface.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QMEDIABINDABLEINTERFACE_H | #ifndef QMEDIABINDABLEINTERFACE_H | |||
#define QMEDIABINDABLEINTERFACE_H | #define QMEDIABINDABLEINTERFACE_H | |||
#include <qmediaobject.h> | #include <qmediaobject.h> | |||
QT_BEGIN_NAMESPACE | QT_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qmediacontainercontrol.h | qmediacontainercontrol.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QMEDIACONTAINERCONTROL_H | #ifndef QMEDIACONTAINERCONTROL_H | |||
#define QMEDIACONTAINERCONTROL_H | #define QMEDIACONTAINERCONTROL_H | |||
#include "qmediacontrol.h" | #include "qmediacontrol.h" | |||
QT_BEGIN_NAMESPACE | QT_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qmediacontent.h | qmediacontent.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qmediacontrol.h | qmediacontrol.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qmediaencodersettings.h | qmediaencodersettings.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qmediaimageviewer.h | qmediaimageviewer.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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" | |||
#include <qmediaenumdebug.h> | ||||
QT_BEGIN_NAMESPACE | QT_BEGIN_NAMESPACE | |||
class QAbstractVideoSurface; | ||||
class QGraphicsVideoItem; | class QGraphicsVideoItem; | |||
class QMediaPlaylist; | class QMediaPlaylist; | |||
class QVideoWidget; | class QVideoWidget; | |||
class QMediaImageViewerPrivate; | class QMediaImageViewerPrivate; | |||
class Q_MULTIMEDIA_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) | |||
skipping to change at line 95 | skipping to change at line 97 | |||
MediaStatus mediaStatus() const; | MediaStatus mediaStatus() const; | |||
QMediaContent media() const; | QMediaContent media() const; | |||
QMediaPlaylist *playlist() const; | QMediaPlaylist *playlist() const; | |||
int timeout() const; | int timeout() const; | |||
int elapsedTime() const; | int elapsedTime() const; | |||
void setVideoOutput(QVideoWidget *widget); | void setVideoOutput(QVideoWidget *widget); | |||
void setVideoOutput(QGraphicsVideoItem *item); | void setVideoOutput(QGraphicsVideoItem *item); | |||
void setVideoOutput(QAbstractVideoSurface *surface); | ||||
bool bind(QObject *); | 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 setPlaylist(QMediaPlaylist *playlist); | |||
void play(); | void play(); | |||
void pause(); | void pause(); | |||
skipping to change at line 126 | skipping to change at line 129 | |||
private: | private: | |||
Q_DECLARE_PRIVATE(QMediaImageViewer) | Q_DECLARE_PRIVATE(QMediaImageViewer) | |||
Q_PRIVATE_SLOT(d_func(), void _q_mediaStatusChanged(QMediaImageViewer:: MediaStatus)) | Q_PRIVATE_SLOT(d_func(), void _q_mediaStatusChanged(QMediaImageViewer:: MediaStatus)) | |||
Q_PRIVATE_SLOT(d_func(), void _q_playlistMediaChanged(const QMediaConte nt &)) | Q_PRIVATE_SLOT(d_func(), void _q_playlistMediaChanged(const QMediaConte nt &)) | |||
Q_PRIVATE_SLOT(d_func(), void _q_playlistDestroyed()) | Q_PRIVATE_SLOT(d_func(), void _q_playlistDestroyed()) | |||
}; | }; | |||
QT_END_NAMESPACE | QT_END_NAMESPACE | |||
Q_DECLARE_METATYPE(QMediaImageViewer::State) | ||||
Q_DECLARE_METATYPE(QMediaImageViewer::MediaStatus) | ||||
Q_MEDIA_ENUM_DEBUG(QMediaImageViewer, State) | ||||
Q_MEDIA_ENUM_DEBUG(QMediaImageViewer, MediaStatus) | ||||
#endif | #endif | |||
End of changes. 7 change blocks. | ||||
14 lines changed or deleted | 23 lines changed or added | |||
qmediaobject.h | qmediaobject.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qmediaplayer.h | qmediaplayer.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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" | |||
#include "qmediaenumdebug.h" | ||||
#include <QtNetwork/qnetworkconfiguration.h> | ||||
QT_BEGIN_HEADER | QT_BEGIN_HEADER | |||
QT_BEGIN_NAMESPACE | QT_BEGIN_NAMESPACE | |||
class QAbstractVideoSurface; | ||||
class QMediaPlaylist; | class QMediaPlaylist; | |||
class QVideoWidget; | class QVideoWidget; | |||
class QGraphicsVideoItem; | class QGraphicsVideoItem; | |||
class QMediaPlayerPrivate; | class QMediaPlayerPrivate; | |||
class Q_MULTIMEDIA_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(QMediaPlaylist * playlist READ playlist WRITE setPlaylist) | |||
skipping to change at line 77 | skipping to change at line 81 | |||
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) | |||
Q_PROPERTY(MediaStatus mediaStatus READ mediaStatus NOTIFY mediaStatusC hanged) | Q_PROPERTY(MediaStatus mediaStatus READ mediaStatus NOTIFY mediaStatusC hanged) | |||
Q_PROPERTY(QString error READ errorString) | Q_PROPERTY(QString error READ errorString) | |||
Q_ENUMS(State) | Q_ENUMS(State) | |||
Q_ENUMS(MediaStatus) | Q_ENUMS(MediaStatus) | |||
Q_ENUMS(Error) | ||||
public: | public: | |||
enum State | enum State | |||
{ | { | |||
StoppedState, | StoppedState, | |||
PlayingState, | PlayingState, | |||
PausedState | PausedState | |||
}; | }; | |||
enum MediaStatus | enum MediaStatus | |||
skipping to change at line 102 | skipping to change at line 107 | |||
StalledMedia, | StalledMedia, | |||
BufferingMedia, | BufferingMedia, | |||
BufferedMedia, | BufferedMedia, | |||
EndOfMedia, | EndOfMedia, | |||
InvalidMedia | InvalidMedia | |||
}; | }; | |||
enum Flag | enum Flag | |||
{ | { | |||
LowLatency = 0x01, | LowLatency = 0x01, | |||
StreamPlayback = 0x02 | StreamPlayback = 0x02, | |||
VideoSurface = 0x04 | ||||
}; | }; | |||
Q_DECLARE_FLAGS(Flags, Flag) | Q_DECLARE_FLAGS(Flags, Flag) | |||
enum Error | enum Error | |||
{ | { | |||
NoError, | NoError, | |||
ResourceError, | ResourceError, | |||
FormatError, | FormatError, | |||
NetworkError, | NetworkError, | |||
AccessDeniedError, | AccessDeniedError, | |||
skipping to change at line 126 | skipping to change at line 132 | |||
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 QtMultimediaKit::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(QVideoWidget *); | |||
void setVideoOutput(QGraphicsVideoItem *); | void setVideoOutput(QGraphicsVideoItem *); | |||
void setVideoOutput(QAbstractVideoSurface *surface); | ||||
QMediaContent media() const; | QMediaContent media() const; | |||
const QIODevice *mediaStream() const; | const QIODevice *mediaStream() const; | |||
QMediaPlaylist *playlist() 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; | |||
skipping to change at line 150 | skipping to change at line 157 | |||
bool isVideoAvailable() const; | bool isVideoAvailable() const; | |||
int bufferStatus() const; | int bufferStatus() const; | |||
bool isSeekable() const; | bool isSeekable() const; | |||
qreal playbackRate() const; | qreal playbackRate() const; | |||
Error error() const; | Error error() const; | |||
QString errorString() const; | QString errorString() const; | |||
QNetworkConfiguration currentNetworkConfiguration() const; | ||||
public Q_SLOTS: | public Q_SLOTS: | |||
void play(); | void play(); | |||
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); | void setPlaylist(QMediaPlaylist *playlist); | |||
void setNetworkConfigurations(const QList<QNetworkConfiguration> &confi | ||||
gurations); | ||||
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); | |||
void volumeChanged(int volume); | void volumeChanged(int volume); | |||
skipping to change at line 185 | skipping to change at line 196 | |||
void audioAvailableChanged(bool available); | void audioAvailableChanged(bool available); | |||
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); | |||
void networkConfigurationChanged(const QNetworkConfiguration &configura tion); | ||||
public: | public: | |||
virtual bool 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()) | |||
}; | }; | |||
QT_END_NAMESPACE | QT_END_NAMESPACE | |||
Q_DECLARE_METATYPE(QMediaPlayer::State) | Q_DECLARE_METATYPE(QMediaPlayer::State) | |||
Q_DECLARE_METATYPE(QMediaPlayer::MediaStatus) | Q_DECLARE_METATYPE(QMediaPlayer::MediaStatus) | |||
Q_DECLARE_METATYPE(QMediaPlayer::Error) | Q_DECLARE_METATYPE(QMediaPlayer::Error) | |||
Q_MEDIA_ENUM_DEBUG(QMediaPlayer, State) | ||||
Q_MEDIA_ENUM_DEBUG(QMediaPlayer, MediaStatus) | ||||
Q_MEDIA_ENUM_DEBUG(QMediaPlayer, Error) | ||||
QT_END_HEADER | QT_END_HEADER | |||
#endif // QMEDIAPLAYER_H | #endif // QMEDIAPLAYER_H | |||
End of changes. 12 change blocks. | ||||
15 lines changed or deleted | 32 lines changed or added | |||
qmediaplayercontrol.h | qmediaplayercontrol.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qmediaplaylist.h | qmediaplaylist.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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> | #include <qmediabindableinterface.h> | |||
#include <qmediaenumdebug.h> | ||||
QT_BEGIN_NAMESPACE | QT_BEGIN_NAMESPACE | |||
class QMediaPlaylistProvider; | class QMediaPlaylistProvider; | |||
class QMediaPlaylistPrivate; | class QMediaPlaylistPrivate; | |||
class Q_MULTIMEDIA_EXPORT QMediaPlaylist : public QObject, public QMediaBin dableInterface | class Q_MULTIMEDIA_EXPORT QMediaPlaylist : public QObject, public QMediaBin dableInterface | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
Q_INTERFACES(QMediaBindableInterface) | Q_INTERFACES(QMediaBindableInterface) | |||
skipping to change at line 142 | skipping to change at line 143 | |||
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) | |||
Q_DECLARE_METATYPE(QMediaPlaylist::Error) | Q_DECLARE_METATYPE(QMediaPlaylist::Error) | |||
Q_MEDIA_ENUM_DEBUG(QMediaPlaylist, PlaybackMode) | ||||
Q_MEDIA_ENUM_DEBUG(QMediaPlaylist, Error) | ||||
#endif // QMEDIAPLAYLIST_H | #endif // QMEDIAPLAYLIST_H | |||
End of changes. 5 change blocks. | ||||
14 lines changed or deleted | 18 lines changed or added | |||
qmediaplaylistcontrol.h | qmediaplaylistcontrol.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QMEDIAPLAYLISTCONTROL_H | #ifndef QMEDIAPLAYLISTCONTROL_H | |||
#define QMEDIAPLAYLISTCONTROL_H | #define QMEDIAPLAYLISTCONTROL_H | |||
#include "qmediacontrol.h" | #include "qmediacontrol.h" | |||
#include "qmediaplaylistnavigator.h" | #include "qmediaplaylistnavigator.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qmediaplaylistioplugin.h | qmediaplaylistioplugin.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QMEDIAPLAYLISTIOPLUGIN_H | #ifndef QMEDIAPLAYLISTIOPLUGIN_H | |||
#define QMEDIAPLAYLISTIOPLUGIN_H | #define QMEDIAPLAYLISTIOPLUGIN_H | |||
#include <QtCore/qobject.h> | #include <QtCore/qobject.h> | |||
#include <QtCore/qplugin.h> | #include <QtCore/qplugin.h> | |||
#include <QtCore/qfactoryinterface.h> | #include <QtCore/qfactoryinterface.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qmediaplaylistnavigator.h | qmediaplaylistnavigator.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QMEDIAPLAYLISTNAVIGATOR_H | #ifndef QMEDIAPLAYLISTNAVIGATOR_H | |||
#define QMEDIAPLAYLISTNAVIGATOR_H | #define QMEDIAPLAYLISTNAVIGATOR_H | |||
#include "qmediaplaylistprovider.h" | #include "qmediaplaylistprovider.h" | |||
#include "qmediaplaylist.h" | #include "qmediaplaylist.h" | |||
#include <QtCore/qobject.h> | #include <QtCore/qobject.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qmediaplaylistprovider.h | qmediaplaylistprovider.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QMEDIAPLAYLISTPROVIDER_H | #ifndef QMEDIAPLAYLISTPROVIDER_H | |||
#define QMEDIAPLAYLISTPROVIDER_H | #define QMEDIAPLAYLISTPROVIDER_H | |||
#include <QObject> | #include <QObject> | |||
#include "qmediacontent.h" | #include "qmediacontent.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qmediaplaylistsourcecontrol.h | qmediaplaylistsourcecontrol.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QMEDIAPLAYLISTSOURCECONTROL_H | #ifndef QMEDIAPLAYLISTSOURCECONTROL_H | |||
#define QMEDIAPLAYLISTSOURCECONTROL_H | #define QMEDIAPLAYLISTSOURCECONTROL_H | |||
#include <qmediacontrol.h> | #include <qmediacontrol.h> | |||
QT_BEGIN_NAMESPACE | QT_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qmediarecorder.h | qmediarecorder.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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 <qmediabindableinterface.h> | |||
#include <qmediaenumdebug.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 | |||
skipping to change at line 185 | skipping to change at line 186 | |||
Q_PRIVATE_SLOT(d_func(), void _q_serviceDestroyed()) | Q_PRIVATE_SLOT(d_func(), void _q_serviceDestroyed()) | |||
Q_PRIVATE_SLOT(d_func(), void _q_notify()) | Q_PRIVATE_SLOT(d_func(), void _q_notify()) | |||
Q_PRIVATE_SLOT(d_func(), void _q_updateNotifyInterval(int)) | 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) | |||
Q_MEDIA_ENUM_DEBUG(QMediaRecorder, State) | ||||
Q_MEDIA_ENUM_DEBUG(QMediaRecorder, Error) | ||||
#endif // QMEDIARECORDER_H | #endif // QMEDIARECORDER_H | |||
End of changes. 5 change blocks. | ||||
14 lines changed or deleted | 18 lines changed or added | |||
qmediarecordercontrol.h | qmediarecordercontrol.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qmediaresource.h | qmediaresource.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qmediaservice.h | qmediaservice.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qmediaserviceprovider.h | qmediaserviceprovider.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QMEDIASERVICEPROVIDER_H | #ifndef QMEDIASERVICEPROVIDER_H | |||
#define QMEDIASERVICEPROVIDER_H | #define QMEDIASERVICEPROVIDER_H | |||
#include <QtCore/qobject.h> | #include <QtCore/qobject.h> | |||
#include <QtCore/qshareddata.h> | #include <QtCore/qshareddata.h> | |||
#include <qmobilityglobal.h> | #include <qmobilityglobal.h> | |||
skipping to change at line 63 | skipping to change at line 63 | |||
class QMediaServiceProviderHintPrivate; | class QMediaServiceProviderHintPrivate; | |||
class Q_MULTIMEDIA_EXPORT QMediaServiceProviderHint | class Q_MULTIMEDIA_EXPORT QMediaServiceProviderHint | |||
{ | { | |||
public: | public: | |||
enum Type { Null, ContentType, Device, SupportedFeatures }; | enum Type { Null, ContentType, Device, SupportedFeatures }; | |||
enum Feature { | enum Feature { | |||
LowLatencyPlayback = 0x01, | LowLatencyPlayback = 0x01, | |||
RecordingSupport = 0x02, | RecordingSupport = 0x02, | |||
StreamPlayback = 0x04 | StreamPlayback = 0x04, | |||
VideoSurface = 0x08 | ||||
}; | }; | |||
Q_DECLARE_FLAGS(Features, Feature) | Q_DECLARE_FLAGS(Features, Feature) | |||
QMediaServiceProviderHint(); | QMediaServiceProviderHint(); | |||
QMediaServiceProviderHint(const QString &mimeType, const QStringList& c odecs); | QMediaServiceProviderHint(const QString &mimeType, const QStringList& c odecs); | |||
QMediaServiceProviderHint(const QByteArray &device); | QMediaServiceProviderHint(const QByteArray &device); | |||
QMediaServiceProviderHint(Features features); | QMediaServiceProviderHint(Features features); | |||
QMediaServiceProviderHint(const QMediaServiceProviderHint &other); | QMediaServiceProviderHint(const QMediaServiceProviderHint &other); | |||
~QMediaServiceProviderHint(); | ~QMediaServiceProviderHint(); | |||
skipping to change at line 96 | skipping to change at line 97 | |||
QByteArray device() const; | QByteArray device() const; | |||
Features features() const; | Features features() const; | |||
//to be extended, if necessary | //to be extended, if necessary | |||
private: | private: | |||
QSharedDataPointer<QMediaServiceProviderHintPrivate> d; | QSharedDataPointer<QMediaServiceProviderHintPrivate> d; | |||
}; | }; | |||
Q_DECLARE_OPERATORS_FOR_FLAGS(QMediaServiceProviderHint::Features) | ||||
class Q_MULTIMEDIA_EXPORT QMediaServiceProvider : public QObject | class Q_MULTIMEDIA_EXPORT QMediaServiceProvider : public QObject | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
public: | public: | |||
virtual QMediaService* requestService(const QByteArray &type, const QMe diaServiceProviderHint &hint = QMediaServiceProviderHint()) = 0; | virtual QMediaService* requestService(const QByteArray &type, const QMe diaServiceProviderHint &hint = QMediaServiceProviderHint()) = 0; | |||
virtual void releaseService(QMediaService *service) = 0; | virtual void releaseService(QMediaService *service) = 0; | |||
virtual QtMultimediaKit::SupportEstimate hasSupport(const QByteArray &s erviceType, | virtual QtMultimediaKit::SupportEstimate hasSupport(const QByteArray &s erviceType, | |||
const QString &mimeType, | const QString &mimeType, | |||
End of changes. 5 change blocks. | ||||
15 lines changed or deleted | 18 lines changed or added | |||
qmediaserviceproviderplugin.h | qmediaserviceproviderplugin.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QMEDIASERVICEPROVIDERPLUGIN_H | #ifndef QMEDIASERVICEPROVIDERPLUGIN_H | |||
#define QMEDIASERVICEPROVIDERPLUGIN_H | #define QMEDIASERVICEPROVIDERPLUGIN_H | |||
#include <QtCore/qstringlist.h> | #include <QtCore/qstringlist.h> | |||
#include <QtCore/qplugin.h> | #include <QtCore/qplugin.h> | |||
#include <QtCore/qfactoryinterface.h> | #include <QtCore/qfactoryinterface.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qmediastreamscontrol.h | qmediastreamscontrol.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QMEDIASTREAMSCONTROL_H | #ifndef QMEDIASTREAMSCONTROL_H | |||
#define QMEDIASTREAMSCONTROL_H | #define QMEDIASTREAMSCONTROL_H | |||
#include "qmediacontrol.h" | #include "qmediacontrol.h" | |||
#include "qtmedianamespace.h" | #include "qtmedianamespace.h" | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include <qmediaenumdebug.h> | ||||
QT_BEGIN_NAMESPACE | QT_BEGIN_NAMESPACE | |||
class Q_MULTIMEDIA_EXPORT QMediaStreamsControl : public QMediaControl | class Q_MULTIMEDIA_EXPORT QMediaStreamsControl : public QMediaControl | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
Q_ENUMS(SteamType) | ||||
public: | public: | |||
enum StreamType { UnknownStream, VideoStream, AudioStream, SubPictureSt ream, DataStream }; | enum StreamType { UnknownStream, VideoStream, AudioStream, SubPictureSt ream, DataStream }; | |||
virtual ~QMediaStreamsControl(); | virtual ~QMediaStreamsControl(); | |||
virtual int streamCount() = 0; | virtual int streamCount() = 0; | |||
virtual StreamType streamType(int streamNumber) = 0; | virtual StreamType streamType(int streamNumber) = 0; | |||
virtual QVariant metaData(int streamNumber, QtMultimediaKit::MetaData k ey) = 0; | virtual QVariant metaData(int streamNumber, QtMultimediaKit::MetaData k ey) = 0; | |||
skipping to change at line 81 | skipping to change at line 82 | |||
protected: | protected: | |||
QMediaStreamsControl(QObject *parent = 0); | QMediaStreamsControl(QObject *parent = 0); | |||
}; | }; | |||
#define QMediaStreamsControl_iid "com.nokia.Qt.QMediaStreamsControl/1.0" | #define QMediaStreamsControl_iid "com.nokia.Qt.QMediaStreamsControl/1.0" | |||
Q_MEDIA_DECLARE_CONTROL(QMediaStreamsControl, QMediaStreamsControl_iid) | Q_MEDIA_DECLARE_CONTROL(QMediaStreamsControl, QMediaStreamsControl_iid) | |||
QT_END_NAMESPACE | QT_END_NAMESPACE | |||
Q_DECLARE_METATYPE(QMediaStreamsControl::StreamType) | ||||
Q_MEDIA_ENUM_DEBUG(QMediaStreamsControl, StreamType) | ||||
#endif // QMEDIASTREAMSCONTROL_H | #endif // QMEDIASTREAMSCONTROL_H | |||
End of changes. 6 change blocks. | ||||
15 lines changed or deleted | 20 lines changed or added | |||
qmediatimerange.h | qmediatimerange.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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> | |||
skipping to change at line 126 | skipping to change at line 126 | |||
private: | private: | |||
QSharedDataPointer<QMediaTimeRangePrivate> d; | QSharedDataPointer<QMediaTimeRangePrivate> d; | |||
}; | }; | |||
Q_MULTIMEDIA_EXPORT bool operator==(const QMediaTimeRange&, const QMediaTim eRange&); | Q_MULTIMEDIA_EXPORT bool operator==(const QMediaTimeRange&, const QMediaTim eRange&); | |||
Q_MULTIMEDIA_EXPORT bool operator!=(const QMediaTimeRange&, const QMediaTim eRange&); | Q_MULTIMEDIA_EXPORT bool operator!=(const QMediaTimeRange&, const QMediaTim eRange&); | |||
Q_MULTIMEDIA_EXPORT QMediaTimeRange operator+(const QMediaTimeRange&, const QMediaTimeRange&); | Q_MULTIMEDIA_EXPORT QMediaTimeRange operator+(const QMediaTimeRange&, const QMediaTimeRange&); | |||
Q_MULTIMEDIA_EXPORT QMediaTimeRange operator-(const QMediaTimeRange&, const QMediaTimeRange&); | Q_MULTIMEDIA_EXPORT QMediaTimeRange operator-(const QMediaTimeRange&, const QMediaTimeRange&); | |||
#ifndef QT_NO_DEBUG_STREAM | ||||
Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug, const QMediaTimeRange &); | ||||
#endif | ||||
QT_END_NAMESPACE | QT_END_NAMESPACE | |||
#endif // QMEDIATIMERANGE_H | #endif // QMEDIATIMERANGE_H | |||
End of changes. 4 change blocks. | ||||
14 lines changed or deleted | 18 lines changed or added | |||
qmetadatareadercontrol.h | qmetadatareadercontrol.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QMETADATAREADERCONTROL_H | #ifndef QMETADATAREADERCONTROL_H | |||
#define QMETADATAREADERCONTROL_H | #define QMETADATAREADERCONTROL_H | |||
#include <qmediacontrol.h> | #include <qmediacontrol.h> | |||
#include <qmediaobject.h> | #include <qmediaobject.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qmetadatawritercontrol.h | qmetadatawritercontrol.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QMETADATAWRITERCONTROL_H | #ifndef QMETADATAWRITERCONTROL_H | |||
#define QMETADATAWRITERCONTROL_H | #define QMETADATAWRITERCONTROL_H | |||
#include "qmediacontrol.h" | #include "qmediacontrol.h" | |||
#include "qmediaobject.h" | #include "qmediaobject.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qmobilityglobal.h | qmobilityglobal.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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.1.3" | #define QTM_VERSION_STR "1.2.0" | |||
/* | /* | |||
QTM_VERSION is (major << 16) + (minor << 8) + patch. | QTM_VERSION is (major << 16) + (minor << 8) + patch. | |||
*/ | */ | |||
#define QTM_VERSION 0x010103 | #define QTM_VERSION 0x010200 | |||
/* | /* | |||
can be used like #if (QTM_VERSION >= QTM_VERSION_CHECK(1, 1, 2)) | can be used like #if (QTM_VERSION >= QTM_VERSION_CHECK(1, 2, 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 "2011-04-19" | #define QTM_PACKAGEDATE_STR "2011-05-10" | |||
#define QTM_PACKAGE_TAG "4ce5093f2cc2ca1d7f7f5a052c33c8a6036cb6e5" | #define QTM_PACKAGE_TAG "fb3e9bc2d941462f1244aaf0ea79425a307f883d" | |||
#include <QtCore/qglobal.h> | #include <QtCore/qglobal.h> | |||
#if defined(QTM_BUILD_UNITTESTS) && (defined(Q_OS_WIN) || defined(Q_OS_SYMB IAN)) && defined(QT_MAKEDLL) | #if defined(QTM_BUILD_UNITTESTS) && (defined(Q_OS_WIN) || defined(Q_OS_SYMB IAN)) && defined(QT_MAKEDLL) | |||
# define QM_AUTOTEST_EXPORT Q_DECL_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) | #elif defined(QTM_BUILD_UNITTESTS) && (defined(Q_OS_WIN) || defined(Q_OS_SY MBIAN)) && defined(QT_DLL) | |||
# define QM_AUTOTEST_EXPORT Q_DECL_IMPORT | # define QM_AUTOTEST_EXPORT Q_DECL_IMPORT | |||
#elif defined(QTM_BUILD_UNITTESTS) && !(defined(Q_OS_WIN) || defined(Q_OS_S YMBIAN)) && defined(QT_SHARED) | #elif defined(QTM_BUILD_UNITTESTS) && !(defined(Q_OS_WIN) || defined(Q_OS_S YMBIAN)) && defined(QT_SHARED) | |||
# define QM_AUTOTEST_EXPORT Q_DECL_EXPORT | # define QM_AUTOTEST_EXPORT Q_DECL_EXPORT | |||
#else | #else | |||
# define QM_AUTOTEST_EXPORT | # define QM_AUTOTEST_EXPORT | |||
skipping to change at line 147 | skipping to change at line 148 | |||
# if defined(QT_BUILD_GALLERY_LIB) | # if defined(QT_BUILD_GALLERY_LIB) | |||
# define Q_GALLERY_EXPORT Q_DECL_EXPORT | # define Q_GALLERY_EXPORT Q_DECL_EXPORT | |||
# else | # else | |||
# define Q_GALLERY_EXPORT Q_DECL_IMPORT | # define Q_GALLERY_EXPORT Q_DECL_IMPORT | |||
# endif | # endif | |||
# if defined(QT_BUILD_ORGANIZER_LIB) | # if defined(QT_BUILD_ORGANIZER_LIB) | |||
# define Q_ORGANIZER_EXPORT Q_DECL_EXPORT | # define Q_ORGANIZER_EXPORT Q_DECL_EXPORT | |||
# else | # else | |||
# define Q_ORGANIZER_EXPORT Q_DECL_IMPORT | # define Q_ORGANIZER_EXPORT Q_DECL_IMPORT | |||
# endif | # endif | |||
# if defined(QT_BUILD_CONNECTIVITY_LIB) | ||||
# define Q_CONNECTIVITY_EXPORT Q_DECL_EXPORT | ||||
# else | ||||
# define Q_CONNECTIVITY_EXPORT Q_DECL_IMPORT | ||||
# endif | ||||
# elif defined(QT_DLL) /* use a Qt DLL library */ | # elif defined(QT_DLL) /* use a Qt DLL library */ | |||
# define Q_BEARER_EXPORT Q_DECL_IMPORT | # define Q_BEARER_EXPORT Q_DECL_IMPORT | |||
# define Q_PUBLISHSUBSCRIBE_EXPORT Q_DECL_IMPORT | # define Q_PUBLISHSUBSCRIBE_EXPORT Q_DECL_IMPORT | |||
# define Q_CONTACTS_EXPORT Q_DECL_IMPORT | # define Q_CONTACTS_EXPORT Q_DECL_IMPORT | |||
# define Q_VERSIT_EXPORT Q_DECL_IMPORT | # define Q_VERSIT_EXPORT Q_DECL_IMPORT | |||
# define Q_VERSIT_ORGANIZER_EXPORT Q_DECL_IMPORT | # define Q_VERSIT_ORGANIZER_EXPORT Q_DECL_IMPORT | |||
# define Q_LOCATION_EXPORT Q_DECL_IMPORT | # define Q_LOCATION_EXPORT Q_DECL_IMPORT | |||
# define Q_MULTIMEDIA_EXPORT Q_DECL_IMPORT | # define Q_MULTIMEDIA_EXPORT Q_DECL_IMPORT | |||
# define Q_MESSAGING_EXPORT Q_DECL_IMPORT | # define Q_MESSAGING_EXPORT Q_DECL_IMPORT | |||
# if QTM_SERVICEFW_SYMBIAN_DATABASEMANAGER_SERVER | # if QTM_SERVICEFW_SYMBIAN_DATABASEMANAGER_SERVER | |||
# define Q_SERVICEFW_EXPORT | # define Q_SERVICEFW_EXPORT | |||
# else | # else | |||
# define Q_SERVICEFW_EXPORT Q_DECL_IMPORT | # define Q_SERVICEFW_EXPORT Q_DECL_IMPORT | |||
# endif | # endif | |||
# define Q_SYSINFO_EXPORT Q_DECL_IMPORT | # define Q_SYSINFO_EXPORT Q_DECL_IMPORT | |||
# define Q_SENSORS_EXPORT Q_DECL_IMPORT | # define Q_SENSORS_EXPORT Q_DECL_IMPORT | |||
# define Q_FEEDBACK_EXPORT Q_DECL_IMPORT | # define Q_FEEDBACK_EXPORT Q_DECL_IMPORT | |||
# define Q_GALLERY_EXPORT Q_DECL_IMPORT | # define Q_GALLERY_EXPORT Q_DECL_IMPORT | |||
# define Q_ORGANIZER_EXPORT Q_DECL_IMPORT | # define Q_ORGANIZER_EXPORT Q_DECL_IMPORT | |||
# define Q_CONNECTIVITY_EXPORT Q_DECL_IMPORT | ||||
# endif | # endif | |||
#endif | #endif | |||
#if !defined(Q_SERVICEFW_EXPORT) | #if !defined(Q_SERVICEFW_EXPORT) | |||
# if defined(QT_SHARED) | # if defined(QT_SHARED) | |||
# define Q_BEARER_EXPORT Q_DECL_EXPORT | # define Q_BEARER_EXPORT Q_DECL_EXPORT | |||
# define Q_PUBLISHSUBSCRIBE_EXPORT Q_DECL_EXPORT | # define Q_PUBLISHSUBSCRIBE_EXPORT Q_DECL_EXPORT | |||
# define Q_CONTACTS_EXPORT Q_DECL_EXPORT | # define Q_CONTACTS_EXPORT Q_DECL_EXPORT | |||
# define Q_VERSIT_EXPORT Q_DECL_EXPORT | # define Q_VERSIT_EXPORT Q_DECL_EXPORT | |||
# define Q_VERSIT_ORGANIZER_EXPORT Q_DECL_EXPORT | # define Q_VERSIT_ORGANIZER_EXPORT Q_DECL_EXPORT | |||
# define Q_LOCATION_EXPORT Q_DECL_EXPORT | # define Q_LOCATION_EXPORT Q_DECL_EXPORT | |||
# define Q_MULTIMEDIA_EXPORT Q_DECL_EXPORT | # define Q_MULTIMEDIA_EXPORT Q_DECL_EXPORT | |||
# define Q_MESSAGING_EXPORT Q_DECL_EXPORT | # define Q_MESSAGING_EXPORT Q_DECL_EXPORT | |||
# define Q_SERVICEFW_EXPORT Q_DECL_EXPORT | # define Q_SERVICEFW_EXPORT Q_DECL_EXPORT | |||
# define Q_SYSINFO_EXPORT Q_DECL_EXPORT | # define Q_SYSINFO_EXPORT Q_DECL_EXPORT | |||
# define Q_SENSORS_EXPORT Q_DECL_EXPORT | # define Q_SENSORS_EXPORT Q_DECL_EXPORT | |||
# define Q_FEEDBACK_EXPORT Q_DECL_EXPORT | # define Q_FEEDBACK_EXPORT Q_DECL_EXPORT | |||
# define Q_GALLERY_EXPORT Q_DECL_EXPORT | # define Q_GALLERY_EXPORT Q_DECL_EXPORT | |||
# define Q_ORGANIZER_EXPORT Q_DECL_EXPORT | # define Q_ORGANIZER_EXPORT Q_DECL_EXPORT | |||
# define Q_CONNECTIVITY_EXPORT Q_DECL_EXPORT | ||||
# else | # else | |||
# define Q_BEARER_EXPORT | # define Q_BEARER_EXPORT | |||
# define Q_PUBLISHSUBSCRIBE_EXPORT | # define Q_PUBLISHSUBSCRIBE_EXPORT | |||
# define Q_CONTACTS_EXPORT | # define Q_CONTACTS_EXPORT | |||
# define Q_VERSIT_EXPORT | # define Q_VERSIT_EXPORT | |||
# define Q_VERSIT_ORGANIZER_EXPORT | # define Q_VERSIT_ORGANIZER_EXPORT | |||
# define Q_LOCATION_EXPORT | # define Q_LOCATION_EXPORT | |||
# define Q_MULTIMEDIA_EXPORT | # define Q_MULTIMEDIA_EXPORT | |||
# define Q_MESSAGING_EXPORT | # define Q_MESSAGING_EXPORT | |||
# define Q_SERVICEFW_EXPORT | # define Q_SERVICEFW_EXPORT | |||
# define Q_SYSINFO_EXPORT | # define Q_SYSINFO_EXPORT | |||
# define Q_SENSORS_EXPORT | # define Q_SENSORS_EXPORT | |||
# define Q_FEEDBACK_EXPORT | # define Q_FEEDBACK_EXPORT | |||
# define Q_GALLERY_EXPORT | # define Q_GALLERY_EXPORT | |||
# define Q_ORGANIZER_EXPORT | # define Q_ORGANIZER_EXPORT | |||
# define Q_CONNECTIVITY_EXPORT | ||||
# endif | # endif | |||
#endif | #endif | |||
#ifdef QTM_SERVICEFW_SYMBIAN_DATABASEMANAGER_SERVER | #ifdef QTM_SERVICEFW_SYMBIAN_DATABASEMANAGER_SERVER | |||
# ifdef Q_SERVICEFW_EXPORT | # ifdef Q_SERVICEFW_EXPORT | |||
# undef Q_SERVICEFW_EXPORT | # undef Q_SERVICEFW_EXPORT | |||
# endif | # endif | |||
# define Q_SERVICEFW_EXPORT | # define Q_SERVICEFW_EXPORT | |||
# ifdef QM_AUTOTEST_EXPORT | # ifdef QM_AUTOTEST_EXPORT | |||
# undef QM_AUTOTEST_EXPORT | # undef QM_AUTOTEST_EXPORT | |||
End of changes. 13 change blocks. | ||||
19 lines changed or deleted | 28 lines changed or added | |||
qnetworkconfigmanager.h | qnetworkconfigmanager.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QNETWORKCONFIGURATIONMANAGER_H | #ifndef QNETWORKCONFIGURATIONMANAGER_H | |||
#define QNETWORKCONFIGURATIONMANAGER_H | #define QNETWORKCONFIGURATIONMANAGER_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include <QtCore/qobject.h> | #include <QtCore/qobject.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qnetworkconfiguration.h | qnetworkconfiguration.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QNETWORKCONFIGURATION_H | #ifndef QNETWORKCONFIGURATION_H | |||
#define QNETWORKCONFIGURATION_H | #define QNETWORKCONFIGURATION_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include <QtCore/qshareddata.h> | #include <QtCore/qshareddata.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qnetworksession.h | qnetworksession.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QNETWORKSESSION_H | #ifndef QNETWORKSESSION_H | |||
#define QNETWORKSESSION_H | #define QNETWORKSESSION_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include <QtCore/qobject.h> | #include <QtCore/qobject.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qnmeapositioninfosource.h | qnmeapositioninfosource.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QNMEAPOSITIONINFOSOURCE_H | #ifndef QNMEAPOSITIONINFOSOURCE_H | |||
#define QNMEAPOSITIONINFOSOURCE_H | #define QNMEAPOSITIONINFOSOURCE_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include "qgeopositioninfosource.h" | #include "qgeopositioninfosource.h" | |||
QT_BEGIN_NAMESPACE | QT_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizerabstractrequest.h | qorganizerabstractrequest.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERABSTRACTREQUEST_H | #ifndef QORGANIZERABSTRACTREQUEST_H | |||
#define QORGANIZERABSTRACTREQUEST_H | #define QORGANIZERABSTRACTREQUEST_H | |||
#include "qorganizermanager.h" | #include "qorganizermanager.h" | |||
#include <QObject> | #include <QObject> | |||
skipping to change at line 87 | skipping to change at line 87 | |||
ItemFetchRequest, | ItemFetchRequest, | |||
ItemFetchForExportRequest, | ItemFetchForExportRequest, | |||
ItemIdFetchRequest, | ItemIdFetchRequest, | |||
ItemRemoveRequest, | ItemRemoveRequest, | |||
ItemSaveRequest, | ItemSaveRequest, | |||
DetailDefinitionFetchRequest, | DetailDefinitionFetchRequest, | |||
DetailDefinitionRemoveRequest, | DetailDefinitionRemoveRequest, | |||
DetailDefinitionSaveRequest, | DetailDefinitionSaveRequest, | |||
CollectionFetchRequest, | CollectionFetchRequest, | |||
CollectionRemoveRequest, | CollectionRemoveRequest, | |||
CollectionSaveRequest | CollectionSaveRequest, | |||
ItemFetchByIdRequest | ||||
}; | }; | |||
RequestType type() const; | RequestType type() const; | |||
/* Which manager we want to perform the asynchronous request */ | /* Which manager we want to perform the asynchronous request */ | |||
QOrganizerManager* manager() const; | QOrganizerManager* manager() const; | |||
void setManager(QOrganizerManager* manager); | void setManager(QOrganizerManager* manager); | |||
public Q_SLOTS: | public Q_SLOTS: | |||
/* Verbs */ | /* Verbs */ | |||
skipping to change at line 116 | skipping to change at line 117 | |||
void resultsAvailable(); | void resultsAvailable(); | |||
protected: | protected: | |||
QOrganizerAbstractRequest(QOrganizerAbstractRequestPrivate* otherd, QOb ject* parent = 0); | QOrganizerAbstractRequest(QOrganizerAbstractRequestPrivate* otherd, QOb ject* parent = 0); | |||
QOrganizerAbstractRequestPrivate* d_ptr; | QOrganizerAbstractRequestPrivate* d_ptr; | |||
private: | private: | |||
QOrganizerAbstractRequest(QObject* parent = 0) : QObject(parent), d_ptr (0) {} | QOrganizerAbstractRequest(QObject* parent = 0) : QObject(parent), d_ptr (0) {} | |||
Q_DISABLE_COPY(QOrganizerAbstractRequest) | Q_DISABLE_COPY(QOrganizerAbstractRequest) | |||
friend class QOrganizerManagerEngine; | friend class QOrganizerManagerEngine; | |||
friend class QOrganizerManagerEngineV2; | ||||
friend class QOrganizerManagerEngineV2Wrapper; | ||||
friend class QOrganizerAbstractRequestPrivate; | friend class QOrganizerAbstractRequestPrivate; | |||
#ifndef QT_NO_DEBUG_STREAM | ||||
friend Q_ORGANIZER_EXPORT QDebug operator<<(QDebug dbg, const QOrganize | ||||
rAbstractRequest& request); | ||||
#endif | ||||
}; | }; | |||
QTM_END_NAMESPACE | QTM_END_NAMESPACE | |||
#endif | #endif | |||
End of changes. 6 change blocks. | ||||
15 lines changed or deleted | 22 lines changed or added | |||
qorganizercollection.h | qorganizercollection.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERCOLLECTION_H | #ifndef QORGANIZERCOLLECTION_H | |||
#define QORGANIZERCOLLECTION_H | #define QORGANIZERCOLLECTION_H | |||
#include <QVariantMap> | #include <QVariantMap> | |||
#include <QVariant> | #include <QVariant> | |||
#include <QString> | #include <QString> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizercollectionchangeset.h | qorganizercollectionchangeset.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERCOLLECTIONCHANGESET_H | #ifndef QORGANIZERCOLLECTIONCHANGESET_H | |||
#define QORGANIZERCOLLECTIONCHANGESET_H | #define QORGANIZERCOLLECTIONCHANGESET_H | |||
#include "qtorganizerglobal.h" | #include "qtorganizerglobal.h" | |||
#include "qorganizercollectionid.h" | #include "qorganizercollectionid.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizercollectionengineid.h | qorganizercollectionengineid.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERCOLLECTIONENGINEID_H | #ifndef QORGANIZERCOLLECTIONENGINEID_H | |||
#define QORGANIZERCOLLECTIONENGINEID_H | #define QORGANIZERCOLLECTIONENGINEID_H | |||
#include <QString> | #include <QString> | |||
#include <QSharedDataPointer> | #include <QSharedDataPointer> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizercollectionfetchrequest.h | qorganizercollectionfetchrequest.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERCOLLECTIONFETCHREQUEST_H | #ifndef QORGANIZERCOLLECTIONFETCHREQUEST_H | |||
#define QORGANIZERCOLLECTIONFETCHREQUEST_H | #define QORGANIZERCOLLECTIONFETCHREQUEST_H | |||
#include "qtorganizerglobal.h" | #include "qtorganizerglobal.h" | |||
#include "qorganizerabstractrequest.h" | #include "qorganizerabstractrequest.h" | |||
#include "qorganizercollection.h" | #include "qorganizercollection.h" | |||
skipping to change at line 62 | skipping to change at line 62 | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
class QOrganizerCollectionFetchRequestPrivate; | class QOrganizerCollectionFetchRequestPrivate; | |||
class Q_ORGANIZER_EXPORT QOrganizerCollectionFetchRequest : public QOrganiz erAbstractRequest | class Q_ORGANIZER_EXPORT QOrganizerCollectionFetchRequest : public QOrganiz erAbstractRequest | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
public: | public: | |||
QOrganizerCollectionFetchRequest(QObject* parent = 0); | QOrganizerCollectionFetchRequest(QObject* parent = 0); | |||
~QOrganizerCollectionFetchRequest(); | ||||
/* Selection, restriction and sorting */ | /* Selection, restriction and sorting */ | |||
// none. you get all collections from the manager. | // none. you get all collections from the manager. | |||
/* Results */ | /* Results */ | |||
QList<QOrganizerCollection> collections() const; | QList<QOrganizerCollection> collections() const; | |||
private: | private: | |||
Q_DISABLE_COPY(QOrganizerCollectionFetchRequest) | Q_DISABLE_COPY(QOrganizerCollectionFetchRequest) | |||
friend class QOrganizerManagerEngine; | friend class QOrganizerManagerEngine; | |||
End of changes. 4 change blocks. | ||||
14 lines changed or deleted | 15 lines changed or added | |||
qorganizercollectionid.h | qorganizercollectionid.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERCOLLECTIONID_H | #ifndef QORGANIZERCOLLECTIONID_H | |||
#define QORGANIZERCOLLECTIONID_H | #define QORGANIZERCOLLECTIONID_H | |||
#include <QMap> | #include <QMap> | |||
#include <QString> | #include <QString> | |||
#include <QSharedDataPointer> | #include <QSharedDataPointer> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizercollectionremoverequest.h | qorganizercollectionremoverequest.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERCOLLECTIONREMOVEREQUEST_H | #ifndef QORGANIZERCOLLECTIONREMOVEREQUEST_H | |||
#define QORGANIZERCOLLECTIONREMOVEREQUEST_H | #define QORGANIZERCOLLECTIONREMOVEREQUEST_H | |||
#include "qtorganizerglobal.h" | #include "qtorganizerglobal.h" | |||
#include "qorganizerabstractrequest.h" | #include "qorganizerabstractrequest.h" | |||
#include "qorganizercollection.h" | #include "qorganizercollection.h" | |||
skipping to change at line 61 | skipping to change at line 61 | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
class QOrganizerCollectionRemoveRequestPrivate; | class QOrganizerCollectionRemoveRequestPrivate; | |||
class Q_ORGANIZER_EXPORT QOrganizerCollectionRemoveRequest : public QOrgani zerAbstractRequest | class Q_ORGANIZER_EXPORT QOrganizerCollectionRemoveRequest : public QOrgani zerAbstractRequest | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
public: | public: | |||
QOrganizerCollectionRemoveRequest(QObject* parent = 0); | QOrganizerCollectionRemoveRequest(QObject* parent = 0); | |||
~QOrganizerCollectionRemoveRequest(); | ||||
/* Selection */ | /* Selection */ | |||
void setCollectionId(const QOrganizerCollectionId& collectionId); | void setCollectionId(const QOrganizerCollectionId& collectionId); | |||
void setCollectionIds(const QList<QOrganizerCollectionId>& collectionId s); | void setCollectionIds(const QList<QOrganizerCollectionId>& collectionId s); | |||
QList<QOrganizerCollectionId> collectionIds() const; | QList<QOrganizerCollectionId> collectionIds() const; | |||
/* Results */ | /* Results */ | |||
QMap<int, QOrganizerManager::Error> errorMap() const; | QMap<int, QOrganizerManager::Error> errorMap() const; | |||
private: | private: | |||
End of changes. 4 change blocks. | ||||
14 lines changed or deleted | 15 lines changed or added | |||
qorganizercollectionsaverequest.h | qorganizercollectionsaverequest.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERCOLLECTIONSAVEREQUEST_H | #ifndef QORGANIZERCOLLECTIONSAVEREQUEST_H | |||
#define QORGANIZERCOLLECTIONSAVEREQUEST_H | #define QORGANIZERCOLLECTIONSAVEREQUEST_H | |||
#include "qtorganizerglobal.h" | #include "qtorganizerglobal.h" | |||
#include "qorganizerabstractrequest.h" | #include "qorganizerabstractrequest.h" | |||
#include "qorganizercollection.h" | #include "qorganizercollection.h" | |||
skipping to change at line 62 | skipping to change at line 62 | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
class QOrganizerCollectionSaveRequestPrivate; | class QOrganizerCollectionSaveRequestPrivate; | |||
class Q_ORGANIZER_EXPORT QOrganizerCollectionSaveRequest : public QOrganize rAbstractRequest | class Q_ORGANIZER_EXPORT QOrganizerCollectionSaveRequest : public QOrganize rAbstractRequest | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
public: | public: | |||
QOrganizerCollectionSaveRequest(QObject* parent = 0); | QOrganizerCollectionSaveRequest(QObject* parent = 0); | |||
~QOrganizerCollectionSaveRequest(); | ||||
/* Selection */ | /* Selection */ | |||
void setCollection(const QOrganizerCollection& collection); | void setCollection(const QOrganizerCollection& collection); | |||
void setCollections(const QList<QOrganizerCollection>& collections); | void setCollections(const QList<QOrganizerCollection>& collections); | |||
/* Results */ | /* Results */ | |||
QList<QOrganizerCollection> collections() const; | QList<QOrganizerCollection> collections() const; | |||
QMap<int, QOrganizerManager::Error> errorMap() const; | QMap<int, QOrganizerManager::Error> errorMap() const; | |||
private: | private: | |||
End of changes. 4 change blocks. | ||||
14 lines changed or deleted | 15 lines changed or added | |||
qorganizerevent.h | qorganizerevent.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZEREVENT_H | #ifndef QORGANIZEREVENT_H | |||
#define QORGANIZEREVENT_H | #define QORGANIZEREVENT_H | |||
#include "qtorganizer.h" | #include "qtorganizer.h" | |||
#include "qorganizeritemrecurrence.h" | #include "qorganizeritemrecurrence.h" | |||
#include "qorganizeritempriority.h" | #include "qorganizeritempriority.h" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
class Q_ORGANIZER_EXPORT QOrganizerEvent : public QOrganizerItem | class Q_ORGANIZER_EXPORT QOrganizerEvent : public QOrganizerItem | |||
{ | { | |||
public: | public: | |||
#if !Q_QDOC | ||||
#ifdef Q_QDOC | ||||
static const QLatin1Constant QOrganizerEvent; | ||||
#else | ||||
Q_DECLARE_CUSTOM_ORGANIZER_ITEM(QOrganizerEvent, QOrganizerItemType::Ty peEvent) | Q_DECLARE_CUSTOM_ORGANIZER_ITEM(QOrganizerEvent, QOrganizerItemType::Ty peEvent) | |||
#endif | #endif | |||
void setStartDateTime(const QDateTime& startDateTime); | void setStartDateTime(const QDateTime& startDateTime); | |||
QDateTime startDateTime() const; | QDateTime startDateTime() const; | |||
void setEndDateTime(const QDateTime& endDateTime); | void setEndDateTime(const QDateTime& endDateTime); | |||
QDateTime endDateTime() const; | QDateTime endDateTime() const; | |||
void setAllDay(bool isAllDay); | void setAllDay(bool isAllDay); | |||
bool isAllDay() const; | bool isAllDay() const; | |||
End of changes. 4 change blocks. | ||||
15 lines changed or deleted | 18 lines changed or added | |||
qorganizereventoccurrence.h | qorganizereventoccurrence.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZEREVENTOCCURRENCE_H | #ifndef QORGANIZEREVENTOCCURRENCE_H | |||
#define QORGANIZEREVENTOCCURRENCE_H | #define QORGANIZEREVENTOCCURRENCE_H | |||
#include "qtorganizer.h" | #include "qtorganizer.h" | |||
#include "qorganizeritempriority.h" | #include "qorganizeritempriority.h" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
class Q_ORGANIZER_EXPORT QOrganizerEventOccurrence : public QOrganizerItem | class Q_ORGANIZER_EXPORT QOrganizerEventOccurrence : public QOrganizerItem | |||
{ | { | |||
public: | public: | |||
#if !Q_QDOC | ||||
#ifdef Q_QDOC | ||||
static const QLatin1Constant QOrganizerEventOccurrence; | ||||
#else | ||||
Q_DECLARE_CUSTOM_ORGANIZER_ITEM(QOrganizerEventOccurrence, QOrganizerIt emType::TypeEventOccurrence) | Q_DECLARE_CUSTOM_ORGANIZER_ITEM(QOrganizerEventOccurrence, QOrganizerIt emType::TypeEventOccurrence) | |||
#endif | #endif | |||
void setStartDateTime(const QDateTime& startDateTime); | void setStartDateTime(const QDateTime& startDateTime); | |||
QDateTime startDateTime() const; | QDateTime startDateTime() const; | |||
void setEndDateTime(const QDateTime& endDateTime); | void setEndDateTime(const QDateTime& endDateTime); | |||
QDateTime endDateTime() const; | QDateTime endDateTime() const; | |||
void setParentId(const QOrganizerItemId& parentId); | void setParentId(const QOrganizerItemId& parentId); | |||
QOrganizerItemId parentId() const; | QOrganizerItemId parentId() const; | |||
End of changes. 4 change blocks. | ||||
15 lines changed or deleted | 18 lines changed or added | |||
qorganizereventtime.h | qorganizereventtime.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZEREVENTTIME_H | #ifndef QORGANIZEREVENTTIME_H | |||
#define QORGANIZEREVENTTIME_H | #define QORGANIZEREVENTTIME_H | |||
#include <QString> | #include <QString> | |||
#include "qtorganizerglobal.h" | #include "qtorganizerglobal.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizeritem.h | qorganizeritem.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEM_H | #ifndef QORGANIZERITEM_H | |||
#define QORGANIZERITEM_H | #define QORGANIZERITEM_H | |||
#include <QVariant> | #include <QVariant> | |||
#include <QString> | #include <QString> | |||
#include <QPair> | #include <QPair> | |||
skipping to change at line 187 | skipping to change at line 187 | |||
void setDisplayLabel(const QString& label); | void setDisplayLabel(const QString& label); | |||
void setDisplayLabel(const QOrganizerItemDisplayLabel& label); | void setDisplayLabel(const QOrganizerItemDisplayLabel& label); | |||
/* The description of the organizer item */ | /* The description of the organizer item */ | |||
QString description() const; | QString description() const; | |||
void setDescription(const QString& description); | void setDescription(const QString& description); | |||
void setDescription(const QOrganizerItemDescription& description); | void setDescription(const QOrganizerItemDescription& description); | |||
QStringList comments() const; | QStringList comments() const; | |||
void clearComments(); | void clearComments(); | |||
void setComments(const QStringList& comments); | ||||
void addComment(const QString& comment); | void addComment(const QString& comment); | |||
QStringList tags() const; | ||||
void clearTags(); | ||||
void addTag(const QString& tag); | ||||
void setTags(const QStringList& tags); | ||||
QString guid() const; | QString guid() const; | |||
void setGuid(const QString& guid); | void setGuid(const QString& guid); | |||
protected: | protected: | |||
explicit QOrganizerItem(const char* type); | explicit QOrganizerItem(const char* type); | |||
QOrganizerItem(const QOrganizerItem &other, const char* expectedType); | QOrganizerItem(const QOrganizerItem &other, const char* expectedType); | |||
QOrganizerItem& assign(const QOrganizerItem &other, const char* expecte dType); | QOrganizerItem& assign(const QOrganizerItem &other, const char* expecte dType); | |||
protected: | protected: | |||
friend class QOrganizerItemData; | friend class QOrganizerItemData; | |||
End of changes. 5 change blocks. | ||||
14 lines changed or deleted | 20 lines changed or added | |||
qorganizeritemaudiblereminder.h | qorganizeritemaudiblereminder.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMAUDIBLEREMINDER_H | #ifndef QORGANIZERITEMAUDIBLEREMINDER_H | |||
#define QORGANIZERITEMAUDIBLEREMINDER_H | #define QORGANIZERITEMAUDIBLEREMINDER_H | |||
#include "qorganizeritemreminder.h" | #include "qorganizeritemreminder.h" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizeritemchangelogfilter.h | qorganizeritemchangelogfilter.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMCHANGELOGFILTER_H | #ifndef QORGANIZERITEMCHANGELOGFILTER_H | |||
#define QORGANIZERITEMCHANGELOGFILTER_H | #define QORGANIZERITEMCHANGELOGFILTER_H | |||
#include "qorganizeritemfilter.h" | #include "qorganizeritemfilter.h" | |||
#include <QDateTime> | #include <QDateTime> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizeritemchangeset.h | qorganizeritemchangeset.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMCHANGESET_H | #ifndef QORGANIZERITEMCHANGESET_H | |||
#define QORGANIZERITEMCHANGESET_H | #define QORGANIZERITEMCHANGESET_H | |||
#include "qtorganizerglobal.h" | #include "qtorganizerglobal.h" | |||
#include "qorganizeritemid.h" | #include "qorganizeritemid.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizeritemcollectionfilter.h | qorganizeritemcollectionfilter.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMCOLLECTIONFILTER_H | #ifndef QORGANIZERITEMCOLLECTIONFILTER_H | |||
#define QORGANIZERITEMCOLLECTIONFILTER_H | #define QORGANIZERITEMCOLLECTIONFILTER_H | |||
#include "qorganizeritemfilter.h" | #include "qorganizeritemfilter.h" | |||
#include "qorganizercollectionid.h" | #include "qorganizercollectionid.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizeritemcomment.h | qorganizeritemcomment.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMCOMMENT_H | #ifndef QORGANIZERITEMCOMMENT_H | |||
#define QORGANIZERITEMCOMMENT_H | #define QORGANIZERITEMCOMMENT_H | |||
#include <QString> | #include <QString> | |||
#include "qtorganizerglobal.h" | #include "qtorganizerglobal.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizeritemdescription.h | qorganizeritemdescription.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMDESCRIPTION_H | #ifndef QORGANIZERITEMDESCRIPTION_H | |||
#define QORGANIZERITEMDESCRIPTION_H | #define QORGANIZERITEMDESCRIPTION_H | |||
#include <QString> | #include <QString> | |||
#include "qtorganizerglobal.h" | #include "qtorganizerglobal.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizeritemdetail.h | qorganizeritemdetail.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMDETAIL_H | #ifndef QORGANIZERITEMDETAIL_H | |||
#define QORGANIZERITEMDETAIL_H | #define QORGANIZERITEMDETAIL_H | |||
#include "qtorganizerglobal.h" | #include "qtorganizerglobal.h" | |||
#include <QSharedDataPointer> | #include <QSharedDataPointer> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizeritemdetaildefinition.h | qorganizeritemdetaildefinition.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMDETAILDEFINITION_H | #ifndef QORGANIZERITEMDETAILDEFINITION_H | |||
#define QORGANIZERITEMDETAILDEFINITION_H | #define QORGANIZERITEMDETAILDEFINITION_H | |||
#include <QStringList> | #include <QStringList> | |||
#include <QString> | #include <QString> | |||
#include <QSharedDataPointer> | #include <QSharedDataPointer> | |||
skipping to change at line 101 | skipping to change at line 101 | |||
private: | private: | |||
QSharedDataPointer<QOrganizerItemDetailDefinitionData> d; | QSharedDataPointer<QOrganizerItemDetailDefinitionData> d; | |||
}; | }; | |||
#ifndef QT_NO_DATASTREAM | #ifndef QT_NO_DATASTREAM | |||
Q_ORGANIZER_EXPORT QDataStream& operator<<(QDataStream& out, const QOrganiz erItemDetailDefinition& definition); | Q_ORGANIZER_EXPORT QDataStream& operator<<(QDataStream& out, const QOrganiz erItemDetailDefinition& definition); | |||
Q_ORGANIZER_EXPORT QDataStream& operator>>(QDataStream& in, QOrganizerItemD etailDefinition& definition); | Q_ORGANIZER_EXPORT QDataStream& operator>>(QDataStream& in, QOrganizerItemD etailDefinition& definition); | |||
#endif | #endif | |||
#ifndef QT_NO_DEBUG_STREAM | ||||
Q_ORGANIZER_EXPORT QDebug operator<<(QDebug dbg, const QOrganizerItemDetail | ||||
Definition& definition); | ||||
#endif | ||||
QTM_END_NAMESPACE | QTM_END_NAMESPACE | |||
Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QOrganizerItemDetailDefinition), Q _MOVABLE_TYPE); | Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QOrganizerItemDetailDefinition), Q _MOVABLE_TYPE); | |||
#endif | #endif | |||
End of changes. 4 change blocks. | ||||
14 lines changed or deleted | 19 lines changed or added | |||
qorganizeritemdetaildefinitionfetchrequest.h | qorganizeritemdetaildefinitionfetchrequest.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMDETAILDEFINITIONFETCHREQUEST_H | #ifndef QORGANIZERITEMDETAILDEFINITIONFETCHREQUEST_H | |||
#define QORGANIZERITEMDETAILDEFINITIONFETCHREQUEST_H | #define QORGANIZERITEMDETAILDEFINITIONFETCHREQUEST_H | |||
#include "qtorganizerglobal.h" | #include "qtorganizerglobal.h" | |||
#include "qorganizerabstractrequest.h" | #include "qorganizerabstractrequest.h" | |||
#include "qorganizeritemdetaildefinition.h" | #include "qorganizeritemdetaildefinition.h" | |||
skipping to change at line 62 | skipping to change at line 62 | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
class QOrganizerItemDetailDefinitionFetchRequestPrivate; | class QOrganizerItemDetailDefinitionFetchRequestPrivate; | |||
class Q_ORGANIZER_EXPORT QOrganizerItemDetailDefinitionFetchRequest : publi c QOrganizerAbstractRequest | class Q_ORGANIZER_EXPORT QOrganizerItemDetailDefinitionFetchRequest : publi c QOrganizerAbstractRequest | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
public: | public: | |||
QOrganizerItemDetailDefinitionFetchRequest(QObject* parent = 0); | QOrganizerItemDetailDefinitionFetchRequest(QObject* parent = 0); | |||
~QOrganizerItemDetailDefinitionFetchRequest(); | ||||
/* Selection */ | /* Selection */ | |||
void setDefinitionName(const QString& definitionName); | void setDefinitionName(const QString& definitionName); | |||
void setDefinitionNames(const QStringList& names); | void setDefinitionNames(const QStringList& names); | |||
QStringList definitionNames() const; | QStringList definitionNames() const; | |||
void setItemType(const QString& organizeritemType); | void setItemType(const QString& organizeritemType); | |||
QString itemType() const; | QString itemType() const; | |||
/* Results */ | /* Results */ | |||
QMap<QString, QOrganizerItemDetailDefinition> definitions() const; | QMap<QString, QOrganizerItemDetailDefinition> definitions() const; | |||
End of changes. 4 change blocks. | ||||
14 lines changed or deleted | 15 lines changed or added | |||
qorganizeritemdetaildefinitionremoverequest.h | qorganizeritemdetaildefinitionremoverequest.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMDETAILDEFINITIONREMOVEREQUEST_H | #ifndef QORGANIZERITEMDETAILDEFINITIONREMOVEREQUEST_H | |||
#define QORGANIZERITEMDETAILDEFINITIONREMOVEREQUEST_H | #define QORGANIZERITEMDETAILDEFINITIONREMOVEREQUEST_H | |||
#include "qtorganizerglobal.h" | #include "qtorganizerglobal.h" | |||
#include "qorganizerabstractrequest.h" | #include "qorganizerabstractrequest.h" | |||
skipping to change at line 59 | skipping to change at line 59 | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
class QOrganizerItemDetailDefinitionRemoveRequestPrivate; | class QOrganizerItemDetailDefinitionRemoveRequestPrivate; | |||
class Q_ORGANIZER_EXPORT QOrganizerItemDetailDefinitionRemoveRequest : publ ic QOrganizerAbstractRequest | class Q_ORGANIZER_EXPORT QOrganizerItemDetailDefinitionRemoveRequest : publ ic QOrganizerAbstractRequest | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
public: | public: | |||
QOrganizerItemDetailDefinitionRemoveRequest(QObject* parent = 0); | QOrganizerItemDetailDefinitionRemoveRequest(QObject* parent = 0); | |||
~QOrganizerItemDetailDefinitionRemoveRequest(); | ||||
/* Selection */ | /* Selection */ | |||
void setDefinitionName(const QString& definitionName); | void setDefinitionName(const QString& definitionName); | |||
void setDefinitionNames(const QStringList& names); | void setDefinitionNames(const QStringList& names); | |||
QStringList definitionNames() const; | QStringList definitionNames() const; | |||
void setItemType(const QString& organizeritemType); | void setItemType(const QString& organizeritemType); | |||
QString itemType() const; | QString itemType() const; | |||
/* Results */ | /* Results */ | |||
QMap<int, QOrganizerManager::Error> errorMap() const; | QMap<int, QOrganizerManager::Error> errorMap() const; | |||
End of changes. 4 change blocks. | ||||
14 lines changed or deleted | 15 lines changed or added | |||
qorganizeritemdetaildefinitionsaverequest.h | qorganizeritemdetaildefinitionsaverequest.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMDETAILDEFINITIONSAVEREQUEST_H | #ifndef QORGANIZERITEMDETAILDEFINITIONSAVEREQUEST_H | |||
#define QORGANIZERITEMDETAILDEFINITIONSAVEREQUEST_H | #define QORGANIZERITEMDETAILDEFINITIONSAVEREQUEST_H | |||
#include "qtorganizerglobal.h" | #include "qtorganizerglobal.h" | |||
#include "qorganizerabstractrequest.h" | #include "qorganizerabstractrequest.h" | |||
#include "qorganizeritemdetaildefinition.h" | #include "qorganizeritemdetaildefinition.h" | |||
skipping to change at line 61 | skipping to change at line 61 | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
class QOrganizerItemDetailDefinitionSaveRequestPrivate; | class QOrganizerItemDetailDefinitionSaveRequestPrivate; | |||
class Q_ORGANIZER_EXPORT QOrganizerItemDetailDefinitionSaveRequest : public QOrganizerAbstractRequest | class Q_ORGANIZER_EXPORT QOrganizerItemDetailDefinitionSaveRequest : public QOrganizerAbstractRequest | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
public: | public: | |||
QOrganizerItemDetailDefinitionSaveRequest(QObject* parent = 0); | QOrganizerItemDetailDefinitionSaveRequest(QObject* parent = 0); | |||
~QOrganizerItemDetailDefinitionSaveRequest(); | ||||
/* Selection */ | /* Selection */ | |||
void setDefinition(const QOrganizerItemDetailDefinition& definition); | void setDefinition(const QOrganizerItemDetailDefinition& definition); | |||
void setDefinitions(const QList<QOrganizerItemDetailDefinition>& defini tions); | void setDefinitions(const QList<QOrganizerItemDetailDefinition>& defini tions); | |||
void setItemType(const QString& organizeritemType); | void setItemType(const QString& organizeritemType); | |||
QString itemType() const; | QString itemType() const; | |||
/* Results */ | /* Results */ | |||
QList<QOrganizerItemDetailDefinition> definitions() const; | QList<QOrganizerItemDetailDefinition> definitions() const; | |||
QMap<int, QOrganizerManager::Error> errorMap() const; | QMap<int, QOrganizerManager::Error> errorMap() const; | |||
End of changes. 4 change blocks. | ||||
14 lines changed or deleted | 15 lines changed or added | |||
qorganizeritemdetailfielddefinition.h | qorganizeritemdetailfielddefinition.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMDETAILFIELDDEFINITION_H | #ifndef QORGANIZERITEMDETAILFIELDDEFINITION_H | |||
#define QORGANIZERITEMDETAILFIELDDEFINITION_H | #define QORGANIZERITEMDETAILFIELDDEFINITION_H | |||
#include <QList> | #include <QList> | |||
#include <QVariant> | #include <QVariant> | |||
#include <QSharedDataPointer> | #include <QSharedDataPointer> | |||
skipping to change at line 83 | skipping to change at line 83 | |||
private: | private: | |||
QSharedDataPointer<QOrganizerItemDetailFieldDefinitionPrivate> d; | QSharedDataPointer<QOrganizerItemDetailFieldDefinitionPrivate> d; | |||
}; | }; | |||
#ifndef QT_NO_DATASTREAM | #ifndef QT_NO_DATASTREAM | |||
Q_ORGANIZER_EXPORT QDataStream& operator<<(QDataStream& out, const QOrganiz erItemDetailFieldDefinition& definition); | Q_ORGANIZER_EXPORT QDataStream& operator<<(QDataStream& out, const QOrganiz erItemDetailFieldDefinition& definition); | |||
Q_ORGANIZER_EXPORT QDataStream& operator>>(QDataStream& in, QOrganizerItemD etailFieldDefinition& definition); | Q_ORGANIZER_EXPORT QDataStream& operator>>(QDataStream& in, QOrganizerItemD etailFieldDefinition& definition); | |||
#endif | #endif | |||
#ifndef QT_NO_DEBUG_STREAM | ||||
Q_ORGANIZER_EXPORT QDebug operator<<(QDebug dbg, const QOrganizerItemDetail | ||||
FieldDefinition& definition); | ||||
#endif | ||||
QTM_END_NAMESPACE | QTM_END_NAMESPACE | |||
Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QOrganizerItemDetailFieldDefinitio n), Q_MOVABLE_TYPE); | Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QOrganizerItemDetailFieldDefinitio n), Q_MOVABLE_TYPE); | |||
#endif | #endif | |||
End of changes. 4 change blocks. | ||||
14 lines changed or deleted | 19 lines changed or added | |||
qorganizeritemdetailfilter.h | qorganizeritemdetailfilter.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMDETAILFILTER_H | #ifndef QORGANIZERITEMDETAILFILTER_H | |||
#define QORGANIZERITEMDETAILFILTER_H | #define QORGANIZERITEMDETAILFILTER_H | |||
#include "qorganizeritemfilter.h" | #include "qorganizeritemfilter.h" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizeritemdetailrangefilter.h | qorganizeritemdetailrangefilter.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMDETAILRANGEFILTER_H | #ifndef QORGANIZERITEMDETAILRANGEFILTER_H | |||
#define QORGANIZERITEMDETAILRANGEFILTER_H | #define QORGANIZERITEMDETAILRANGEFILTER_H | |||
#include "qorganizeritemfilter.h" | #include "qorganizeritemfilter.h" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizeritemdetails.h | qorganizeritemdetails.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMDETAILS_H | #ifndef QORGANIZERITEMDETAILS_H | |||
#define QORGANIZERITEMDETAILS_H | #define QORGANIZERITEMDETAILS_H | |||
// this file includes all of the leaf detail classes | // this file includes all of the leaf detail classes | |||
// provided by the Qt Organizer API. | // provided by the Qt Organizer API. | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizeritemdisplaylabel.h | qorganizeritemdisplaylabel.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMDISPLAYLABEL_H | #ifndef QORGANIZERITEMDISPLAYLABEL_H | |||
#define QORGANIZERITEMDISPLAYLABEL_H | #define QORGANIZERITEMDISPLAYLABEL_H | |||
#include <QString> | #include <QString> | |||
#include "qtorganizerglobal.h" | #include "qtorganizerglobal.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizeritememailreminder.h | qorganizeritememailreminder.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMEMAILREMINDER_H | #ifndef QORGANIZERITEMEMAILREMINDER_H | |||
#define QORGANIZERITEMEMAILREMINDER_H | #define QORGANIZERITEMEMAILREMINDER_H | |||
#include "qorganizeritemreminder.h" | #include "qorganizeritemreminder.h" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizeritemengineid.h | qorganizeritemengineid.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMENGINEID_H | #ifndef QORGANIZERITEMENGINEID_H | |||
#define QORGANIZERITEMENGINEID_H | #define QORGANIZERITEMENGINEID_H | |||
#include <QString> | #include <QString> | |||
#include <QSharedDataPointer> | #include <QSharedDataPointer> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizeritemfetchforexportrequest.h | qorganizeritemfetchforexportrequest.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMFETCHFOREXPORTREQUEST_H | #ifndef QORGANIZERITEMFETCHFOREXPORTREQUEST_H | |||
#define QORGANIZERITEMFETCHFOREXPORTREQUEST_H | #define QORGANIZERITEMFETCHFOREXPORTREQUEST_H | |||
#include "qtorganizerglobal.h" | #include "qtorganizerglobal.h" | |||
#include "qorganizerabstractrequest.h" | #include "qorganizerabstractrequest.h" | |||
#include "qorganizeritemsortorder.h" | #include "qorganizeritemsortorder.h" | |||
skipping to change at line 64 | skipping to change at line 64 | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
class QOrganizerItemFetchForExportRequestPrivate; | class QOrganizerItemFetchForExportRequestPrivate; | |||
class Q_ORGANIZER_EXPORT QOrganizerItemFetchForExportRequest : public QOrga nizerAbstractRequest | class Q_ORGANIZER_EXPORT QOrganizerItemFetchForExportRequest : public QOrga nizerAbstractRequest | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
public: | public: | |||
QOrganizerItemFetchForExportRequest(QObject* parent = 0); | QOrganizerItemFetchForExportRequest(QObject* parent = 0); | |||
~QOrganizerItemFetchForExportRequest(); | ||||
/* Selection, restriction and sorting */ | /* Selection, restriction and sorting */ | |||
void setFilter(const QOrganizerItemFilter& filter); | void setFilter(const QOrganizerItemFilter& filter); | |||
void setSorting(const QList<QOrganizerItemSortOrder>& sorting); | void setSorting(const QList<QOrganizerItemSortOrder>& sorting); | |||
void setFetchHint(const QOrganizerItemFetchHint& fetchHint); | void setFetchHint(const QOrganizerItemFetchHint& fetchHint); | |||
void setStartDate(const QDateTime& date); | void setStartDate(const QDateTime& date); | |||
void setEndDate(const QDateTime& date); | void setEndDate(const QDateTime& date); | |||
QOrganizerItemFilter filter() const; | QOrganizerItemFilter filter() const; | |||
QList<QOrganizerItemSortOrder> sorting() const; | QList<QOrganizerItemSortOrder> sorting() const; | |||
QOrganizerItemFetchHint fetchHint() const; | QOrganizerItemFetchHint fetchHint() const; | |||
End of changes. 4 change blocks. | ||||
14 lines changed or deleted | 15 lines changed or added | |||
qorganizeritemfetchhint.h | qorganizeritemfetchhint.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMFETCHHINT_H | #ifndef QORGANIZERITEMFETCHHINT_H | |||
#define QORGANIZERITEMFETCHHINT_H | #define QORGANIZERITEMFETCHHINT_H | |||
#include <QVariant> | #include <QVariant> | |||
#include <QList> | #include <QList> | |||
#include <QSharedData> | #include <QSharedData> | |||
skipping to change at line 87 | skipping to change at line 87 | |||
private: | private: | |||
QSharedDataPointer<QOrganizerItemFetchHintPrivate> d; | QSharedDataPointer<QOrganizerItemFetchHintPrivate> d; | |||
}; | }; | |||
#ifndef QT_NO_DATASTREAM | #ifndef QT_NO_DATASTREAM | |||
Q_ORGANIZER_EXPORT QDataStream& operator<<(QDataStream& out, const QOrganiz erItemFetchHint& hint); | Q_ORGANIZER_EXPORT QDataStream& operator<<(QDataStream& out, const QOrganiz erItemFetchHint& hint); | |||
Q_ORGANIZER_EXPORT QDataStream& operator>>(QDataStream& in, QOrganizerItemF etchHint& hint); | Q_ORGANIZER_EXPORT QDataStream& operator>>(QDataStream& in, QOrganizerItemF etchHint& hint); | |||
#endif | #endif | |||
#ifndef QT_NO_DEBUG_STREAM | ||||
Q_ORGANIZER_EXPORT QDebug operator<<(QDebug dbg, const QOrganizerItemFetchH | ||||
int& hint); | ||||
#endif | ||||
QTM_END_NAMESPACE | QTM_END_NAMESPACE | |||
#endif | #endif | |||
End of changes. 4 change blocks. | ||||
14 lines changed or deleted | 19 lines changed or added | |||
qorganizeritemfetchrequest.h | qorganizeritemfetchrequest.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMFETCHREQUEST_H | #ifndef QORGANIZERITEMFETCHREQUEST_H | |||
#define QORGANIZERITEMFETCHREQUEST_H | #define QORGANIZERITEMFETCHREQUEST_H | |||
#include "qtorganizerglobal.h" | #include "qtorganizerglobal.h" | |||
#include "qorganizerabstractrequest.h" | #include "qorganizerabstractrequest.h" | |||
#include "qorganizeritemsortorder.h" | #include "qorganizeritemsortorder.h" | |||
skipping to change at line 64 | skipping to change at line 64 | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
class QOrganizerItemFetchRequestPrivate; | class QOrganizerItemFetchRequestPrivate; | |||
class Q_ORGANIZER_EXPORT QOrganizerItemFetchRequest : public QOrganizerAbst ractRequest | class Q_ORGANIZER_EXPORT QOrganizerItemFetchRequest : public QOrganizerAbst ractRequest | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
public: | public: | |||
QOrganizerItemFetchRequest(QObject* parent = 0); | QOrganizerItemFetchRequest(QObject* parent = 0); | |||
~QOrganizerItemFetchRequest(); | ||||
/* Selection, restriction and sorting */ | /* Selection, restriction and sorting */ | |||
void setFilter(const QOrganizerItemFilter& filter); | void setFilter(const QOrganizerItemFilter& filter); | |||
void setSorting(const QList<QOrganizerItemSortOrder>& sorting); | void setSorting(const QList<QOrganizerItemSortOrder>& sorting); | |||
void setFetchHint(const QOrganizerItemFetchHint& fetchHint); | void setFetchHint(const QOrganizerItemFetchHint& fetchHint); | |||
void setStartDate(const QDateTime& date); | void setStartDate(const QDateTime& date); | |||
void setEndDate(const QDateTime& date); | void setEndDate(const QDateTime& date); | |||
void setMaxCount(int maxCount); | ||||
QOrganizerItemFilter filter() const; | QOrganizerItemFilter filter() const; | |||
QList<QOrganizerItemSortOrder> sorting() const; | QList<QOrganizerItemSortOrder> sorting() const; | |||
QOrganizerItemFetchHint fetchHint() const; | QOrganizerItemFetchHint fetchHint() const; | |||
QDateTime startDate() const; | QDateTime startDate() const; | |||
QDateTime endDate() const; | QDateTime endDate() const; | |||
int maxCount() const; | ||||
/* Results */ | /* Results */ | |||
QList<QOrganizerItem> items() const; | QList<QOrganizerItem> items() const; | |||
private: | private: | |||
Q_DISABLE_COPY(QOrganizerItemFetchRequest) | Q_DISABLE_COPY(QOrganizerItemFetchRequest) | |||
friend class QOrganizerManagerEngine; | friend class QOrganizerManagerEngine; | |||
Q_DECLARE_PRIVATE_D(d_ptr, QOrganizerItemFetchRequest) | Q_DECLARE_PRIVATE_D(d_ptr, QOrganizerItemFetchRequest) | |||
}; | }; | |||
End of changes. 6 change blocks. | ||||
14 lines changed or deleted | 17 lines changed or added | |||
qorganizeritemfilter.h | qorganizeritemfilter.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMFILTER_H | #ifndef QORGANIZERITEMFILTER_H | |||
#define QORGANIZERITEMFILTER_H | #define QORGANIZERITEMFILTER_H | |||
#include <QVariant> | #include <QVariant> | |||
#include <QList> | #include <QList> | |||
#include <QDateTime> | #include <QDateTime> | |||
skipping to change at line 118 | skipping to change at line 118 | |||
protected: | protected: | |||
explicit QOrganizerItemFilter(QOrganizerItemFilterPrivate* d); | explicit QOrganizerItemFilter(QOrganizerItemFilterPrivate* d); | |||
protected: | protected: | |||
friend class QOrganizerItemFilterPrivate; | friend class QOrganizerItemFilterPrivate; | |||
#ifndef QT_NO_DATASTREAM | #ifndef QT_NO_DATASTREAM | |||
Q_ORGANIZER_EXPORT friend QDataStream& operator<<(QDataStream& out, con st QOrganizerItemFilter& filter); | Q_ORGANIZER_EXPORT friend QDataStream& operator<<(QDataStream& out, con st QOrganizerItemFilter& filter); | |||
Q_ORGANIZER_EXPORT friend QDataStream& operator>>(QDataStream& in, QOrg anizerItemFilter& filter); | Q_ORGANIZER_EXPORT friend QDataStream& operator>>(QDataStream& in, QOrg anizerItemFilter& filter); | |||
#endif | #endif | |||
#ifndef QT_NO_DEBUG_STREAM | ||||
Q_ORGANIZER_EXPORT friend QDebug operator<<(QDebug dbg, const QOrganize | ||||
rItemFilter& filter); | ||||
#endif | ||||
QSharedDataPointer<QOrganizerItemFilterPrivate> d_ptr; | QSharedDataPointer<QOrganizerItemFilterPrivate> d_ptr; | |||
}; | }; | |||
const Q_ORGANIZER_EXPORT QOrganizerItemFilter operator&(const QOrganizerIte mFilter& left, const QOrganizerItemFilter& right); | const Q_ORGANIZER_EXPORT QOrganizerItemFilter operator&(const QOrganizerIte mFilter& left, const QOrganizerItemFilter& right); | |||
const Q_ORGANIZER_EXPORT QOrganizerItemFilter operator|(const QOrganizerIte mFilter& left, const QOrganizerItemFilter& right); | const Q_ORGANIZER_EXPORT QOrganizerItemFilter operator|(const QOrganizerIte mFilter& left, const QOrganizerItemFilter& right); | |||
QTM_END_NAMESPACE | QTM_END_NAMESPACE | |||
Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QOrganizerItemFilter), Q_MOVABLE_T YPE); | Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QOrganizerItemFilter), Q_MOVABLE_T YPE); | |||
Q_DECLARE_OPERATORS_FOR_FLAGS(QTM_PREPEND_NAMESPACE(QOrganizerItemFilter::M atchFlags)); | Q_DECLARE_OPERATORS_FOR_FLAGS(QTM_PREPEND_NAMESPACE(QOrganizerItemFilter::M atchFlags)); | |||
End of changes. 4 change blocks. | ||||
14 lines changed or deleted | 18 lines changed or added | |||
qorganizeritemfilters.h | qorganizeritemfilters.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMFILTERS_H | #ifndef QORGANIZERITEMFILTERS_H | |||
#define QORGANIZERITEMFILTERS_H | #define QORGANIZERITEMFILTERS_H | |||
// this file includes all of the leaf filter classes | // this file includes all of the leaf filter classes | |||
// provided by the Qt Organizer API. | // provided by the Qt Organizer API. | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizeritemguid.h | qorganizeritemguid.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMGUID_H | #ifndef QORGANIZERITEMGUID_H | |||
#define QORGANIZERITEMGUID_H | #define QORGANIZERITEMGUID_H | |||
#include <QString> | #include <QString> | |||
#include "qtorganizerglobal.h" | #include "qtorganizerglobal.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizeritemid.h | qorganizeritemid.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMID_H | #ifndef QORGANIZERITEMID_H | |||
#define QORGANIZERITEMID_H | #define QORGANIZERITEMID_H | |||
#include <QMap> | #include <QMap> | |||
#include <QString> | #include <QString> | |||
#include <QSharedDataPointer> | #include <QSharedDataPointer> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizeritemidfetchrequest.h | qorganizeritemidfetchrequest.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMIDFETCHREQUEST_H | #ifndef QORGANIZERITEMIDFETCHREQUEST_H | |||
#define QORGANIZERITEMIDFETCHREQUEST_H | #define QORGANIZERITEMIDFETCHREQUEST_H | |||
#include "qtorganizerglobal.h" | #include "qtorganizerglobal.h" | |||
#include "qorganizerabstractrequest.h" | #include "qorganizerabstractrequest.h" | |||
#include "qorganizeritemsortorder.h" | #include "qorganizeritemsortorder.h" | |||
skipping to change at line 62 | skipping to change at line 62 | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
class QOrganizerItemIdFetchRequestPrivate; | class QOrganizerItemIdFetchRequestPrivate; | |||
class Q_ORGANIZER_EXPORT QOrganizerItemIdFetchRequest : public QOrganizerAb stractRequest | class Q_ORGANIZER_EXPORT QOrganizerItemIdFetchRequest : public QOrganizerAb stractRequest | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
public: | public: | |||
QOrganizerItemIdFetchRequest(QObject* parent = 0); | QOrganizerItemIdFetchRequest(QObject* parent = 0); | |||
~QOrganizerItemIdFetchRequest(); | ||||
/* Selection, restriction and sorting */ | /* Selection, restriction and sorting */ | |||
void setFilter(const QOrganizerItemFilter& filter); | void setFilter(const QOrganizerItemFilter& filter); | |||
void setSorting(const QList<QOrganizerItemSortOrder>& sorting); | void setSorting(const QList<QOrganizerItemSortOrder>& sorting); | |||
void setStartDate(const QDateTime& date); | void setStartDate(const QDateTime& date); | |||
void setEndDate(const QDateTime& date); | void setEndDate(const QDateTime& date); | |||
QOrganizerItemFilter filter() const; | QOrganizerItemFilter filter() const; | |||
QList<QOrganizerItemSortOrder> sorting() const; | QList<QOrganizerItemSortOrder> sorting() const; | |||
QDateTime startDate() const; | QDateTime startDate() const; | |||
QDateTime endDate() const; | QDateTime endDate() const; | |||
End of changes. 4 change blocks. | ||||
14 lines changed or deleted | 15 lines changed or added | |||
qorganizeritemidfilter.h | qorganizeritemidfilter.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMIDFILTER_H | #ifndef QORGANIZERITEMIDFILTER_H | |||
#define QORGANIZERITEMIDFILTER_H | #define QORGANIZERITEMIDFILTER_H | |||
#include "qorganizeritemfilter.h" | #include "qorganizeritemfilter.h" | |||
#include "qorganizeritemid.h" | #include "qorganizeritemid.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizeritemintersectionfilter.h | qorganizeritemintersectionfilter.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMINTERSECTIONFILTER_H | #ifndef QORGANIZERITEMINTERSECTIONFILTER_H | |||
#define QORGANIZERITEMINTERSECTIONFILTER_H | #define QORGANIZERITEMINTERSECTIONFILTER_H | |||
#include "qorganizeritemfilter.h" | #include "qorganizeritemfilter.h" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizeriteminvalidfilter.h | qorganizeriteminvalidfilter.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMINVALIDFILTER_H | #ifndef QORGANIZERITEMINVALIDFILTER_H | |||
#define QORGANIZERITEMINVALIDFILTER_H | #define QORGANIZERITEMINVALIDFILTER_H | |||
#include "qorganizeritemfilter.h" | #include "qorganizeritemfilter.h" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizeritemlocation.h | qorganizeritemlocation.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMLOCATION_H | #ifndef QORGANIZERITEMLOCATION_H | |||
#define QORGANIZERITEMLOCATION_H | #define QORGANIZERITEMLOCATION_H | |||
#include <QString> | #include <QString> | |||
#include "qtorganizerglobal.h" | #include "qtorganizerglobal.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizeritemoccurrencefetchrequest.h | qorganizeritemoccurrencefetchrequest.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMOCCURRENCEFETCHREQUEST_H | #ifndef QORGANIZERITEMOCCURRENCEFETCHREQUEST_H | |||
#define QORGANIZERITEMOCCURRENCEFETCHREQUEST_H | #define QORGANIZERITEMOCCURRENCEFETCHREQUEST_H | |||
#include "qtorganizerglobal.h" | #include "qtorganizerglobal.h" | |||
#include "qorganizerabstractrequest.h" | #include "qorganizerabstractrequest.h" | |||
#include "qorganizeritemsortorder.h" | #include "qorganizeritemsortorder.h" | |||
skipping to change at line 64 | skipping to change at line 64 | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
class QOrganizerItemOccurrenceFetchRequestPrivate; | class QOrganizerItemOccurrenceFetchRequestPrivate; | |||
class Q_ORGANIZER_EXPORT QOrganizerItemOccurrenceFetchRequest : public QOrg anizerAbstractRequest | class Q_ORGANIZER_EXPORT QOrganizerItemOccurrenceFetchRequest : public QOrg anizerAbstractRequest | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
public: | public: | |||
QOrganizerItemOccurrenceFetchRequest(QObject* parent = 0); | QOrganizerItemOccurrenceFetchRequest(QObject* parent = 0); | |||
~QOrganizerItemOccurrenceFetchRequest(); | ||||
void setParentItem(const QOrganizerItem& item); | void setParentItem(const QOrganizerItem& item); | |||
void setStartDate(const QDateTime& date); | void setStartDate(const QDateTime& date); | |||
void setEndDate(const QDateTime& date); | void setEndDate(const QDateTime& date); | |||
void setMaxOccurrences(int maxCount); | void setMaxOccurrences(int maxCount); | |||
void setFetchHint(const QOrganizerItemFetchHint& hint); | void setFetchHint(const QOrganizerItemFetchHint& hint); | |||
QOrganizerItem parentItem() const; | QOrganizerItem parentItem() const; | |||
QDateTime startDate() const; | QDateTime startDate() const; | |||
QDateTime endDate() const; | QDateTime endDate() const; | |||
End of changes. 4 change blocks. | ||||
14 lines changed or deleted | 15 lines changed or added | |||
qorganizeritemparent.h | qorganizeritemparent.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMPARENT_H | #ifndef QORGANIZERITEMPARENT_H | |||
#define QORGANIZERITEMPARENT_H | #define QORGANIZERITEMPARENT_H | |||
#include <QString> | #include <QString> | |||
#include "qtorganizerglobal.h" | #include "qtorganizerglobal.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizeritempriority.h | qorganizeritempriority.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMPRIORITY_H | #ifndef QORGANIZERITEMPRIORITY_H | |||
#define QORGANIZERITEMPRIORITY_H | #define QORGANIZERITEMPRIORITY_H | |||
#include <QtDebug> | #include <QtDebug> | |||
#include <QString> | #include <QString> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizeritemrecurrence.h | qorganizeritemrecurrence.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMRECURRENCE_H | #ifndef QORGANIZERITEMRECURRENCE_H | |||
#define QORGANIZERITEMRECURRENCE_H | #define QORGANIZERITEMRECURRENCE_H | |||
#include <QString> | #include <QString> | |||
#include "qtorganizerglobal.h" | #include "qtorganizerglobal.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizeritemreminder.h | qorganizeritemreminder.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMREMINDER_H | #ifndef QORGANIZERITEMREMINDER_H | |||
#define QORGANIZERITEMREMINDER_H | #define QORGANIZERITEMREMINDER_H | |||
#include <QString> | #include <QString> | |||
#include <QUrl> | #include <QUrl> | |||
#include <QList> | #include <QList> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizeritemremoverequest.h | qorganizeritemremoverequest.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMREMOVEREQUEST_H | #ifndef QORGANIZERITEMREMOVEREQUEST_H | |||
#define QORGANIZERITEMREMOVEREQUEST_H | #define QORGANIZERITEMREMOVEREQUEST_H | |||
#include "qtorganizerglobal.h" | #include "qtorganizerglobal.h" | |||
#include "qorganizerabstractrequest.h" | #include "qorganizerabstractrequest.h" | |||
#include "qorganizeritemfilter.h" | #include "qorganizeritemfilter.h" | |||
skipping to change at line 60 | skipping to change at line 60 | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
class QOrganizerItemRemoveRequestPrivate; | class QOrganizerItemRemoveRequestPrivate; | |||
class Q_ORGANIZER_EXPORT QOrganizerItemRemoveRequest : public QOrganizerAbs tractRequest | class Q_ORGANIZER_EXPORT QOrganizerItemRemoveRequest : public QOrganizerAbs tractRequest | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
public: | public: | |||
QOrganizerItemRemoveRequest(QObject* parent = 0); | QOrganizerItemRemoveRequest(QObject* parent = 0); | |||
~QOrganizerItemRemoveRequest(); | ||||
/* Selection */ | /* Selection */ | |||
void setItemId(const QOrganizerItemId& organizeritemId); | void setItemId(const QOrganizerItemId& organizeritemId); | |||
void setItemIds(const QList<QOrganizerItemId>& organizeritemIds); | void setItemIds(const QList<QOrganizerItemId>& organizeritemIds); | |||
QList<QOrganizerItemId> itemIds() const; | QList<QOrganizerItemId> itemIds() const; | |||
/* Results */ | /* Results */ | |||
QMap<int, QOrganizerManager::Error> errorMap() const; | QMap<int, QOrganizerManager::Error> errorMap() const; | |||
private: | private: | |||
End of changes. 4 change blocks. | ||||
14 lines changed or deleted | 15 lines changed or added | |||
qorganizeritemrequests.h | qorganizeritemrequests.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMREQUESTS_H | #ifndef QORGANIZERITEMREQUESTS_H | |||
#define QORGANIZERITEMREQUESTS_H | #define QORGANIZERITEMREQUESTS_H | |||
// this file includes all of the asynchronous request | // this file includes all of the asynchronous request | |||
// leaf classes that are included in the public API | // leaf classes that are included in the public API | |||
#include "qorganizeritemdetaildefinitionfetchrequest.h" | #include "qorganizeritemdetaildefinitionfetchrequest.h" | |||
#include "qorganizeritemdetaildefinitionremoverequest.h" | #include "qorganizeritemdetaildefinitionremoverequest.h" | |||
#include "qorganizeritemdetaildefinitionsaverequest.h" | #include "qorganizeritemdetaildefinitionsaverequest.h" | |||
#include "qorganizeritemoccurrencefetchrequest.h" | #include "qorganizeritemoccurrencefetchrequest.h" | |||
#include "qorganizeritemfetchrequest.h" | #include "qorganizeritemfetchrequest.h" | |||
#include "qorganizeritemfetchbyidrequest.h" | ||||
#include "qorganizeritemfetchforexportrequest.h" | #include "qorganizeritemfetchforexportrequest.h" | |||
#include "qorganizeritemidfetchrequest.h" | #include "qorganizeritemidfetchrequest.h" | |||
#include "qorganizeritemremoverequest.h" | #include "qorganizeritemremoverequest.h" | |||
#include "qorganizeritemsaverequest.h" | #include "qorganizeritemsaverequest.h" | |||
#include "qorganizercollectionfetchrequest.h" | #include "qorganizercollectionfetchrequest.h" | |||
#include "qorganizercollectionremoverequest.h" | #include "qorganizercollectionremoverequest.h" | |||
#include "qorganizercollectionsaverequest.h" | #include "qorganizercollectionsaverequest.h" | |||
#endif | #endif | |||
End of changes. 4 change blocks. | ||||
14 lines changed or deleted | 15 lines changed or added | |||
qorganizeritems.h | qorganizeritems.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMS_H | #ifndef QORGANIZERITEMS_H | |||
#define QORGANIZERITEMS_H | #define QORGANIZERITEMS_H | |||
// this file includes all of the organizer item | // this file includes all of the organizer item | |||
// leaf classes that are included in the public API | // leaf classes that are included in the public API | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizeritemsaverequest.h | qorganizeritemsaverequest.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMSAVEREQUEST_H | #ifndef QORGANIZERITEMSAVEREQUEST_H | |||
#define QORGANIZERITEMSAVEREQUEST_H | #define QORGANIZERITEMSAVEREQUEST_H | |||
#include "qtorganizerglobal.h" | #include "qtorganizerglobal.h" | |||
#include "qorganizerabstractrequest.h" | #include "qorganizerabstractrequest.h" | |||
#include "qorganizeritem.h" | #include "qorganizeritem.h" | |||
skipping to change at line 60 | skipping to change at line 60 | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
class QOrganizerItemSaveRequestPrivate; | class QOrganizerItemSaveRequestPrivate; | |||
class Q_ORGANIZER_EXPORT QOrganizerItemSaveRequest : public QOrganizerAbstr actRequest | class Q_ORGANIZER_EXPORT QOrganizerItemSaveRequest : public QOrganizerAbstr actRequest | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
public: | public: | |||
QOrganizerItemSaveRequest(QObject* parent = 0); | QOrganizerItemSaveRequest(QObject* parent = 0); | |||
~QOrganizerItemSaveRequest(); | ||||
/* Selection */ | /* Selection */ | |||
void setItem(const QOrganizerItem& organizeritem); | void setItem(const QOrganizerItem& organizeritem); | |||
void setItems(const QList<QOrganizerItem>& organizeritems); | void setItems(const QList<QOrganizerItem>& organizeritems); | |||
void setDefinitionMask(const QStringList& definitionMask); | ||||
QStringList definitionMask() const; | ||||
/* Results */ | /* Results */ | |||
QList<QOrganizerItem> items() const; | QList<QOrganizerItem> items() const; | |||
QMap<int, QOrganizerManager::Error> errorMap() const; | QMap<int, QOrganizerManager::Error> errorMap() const; | |||
private: | private: | |||
Q_DISABLE_COPY(QOrganizerItemSaveRequest) | Q_DISABLE_COPY(QOrganizerItemSaveRequest) | |||
friend class QOrganizerManagerEngine; | friend class QOrganizerManagerEngine; | |||
Q_DECLARE_PRIVATE_D(d_ptr, QOrganizerItemSaveRequest) | Q_DECLARE_PRIVATE_D(d_ptr, QOrganizerItemSaveRequest) | |||
}; | }; | |||
End of changes. 5 change blocks. | ||||
14 lines changed or deleted | 18 lines changed or added | |||
qorganizeritemsortorder.h | qorganizeritemsortorder.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMSORTORDER_H | #ifndef QORGANIZERITEMSORTORDER_H | |||
#define QORGANIZERITEMSORTORDER_H | #define QORGANIZERITEMSORTORDER_H | |||
#include "qtorganizerglobal.h" | #include "qtorganizerglobal.h" | |||
#include <QString> | #include <QString> | |||
skipping to change at line 100 | skipping to change at line 100 | |||
private: | private: | |||
QSharedDataPointer<QOrganizerItemSortOrderPrivate> d; | QSharedDataPointer<QOrganizerItemSortOrderPrivate> d; | |||
}; | }; | |||
#ifndef QT_NO_DATASTREAM | #ifndef QT_NO_DATASTREAM | |||
Q_ORGANIZER_EXPORT QDataStream& operator<<(QDataStream& out, const QOrganiz erItemSortOrder& sortOrder); | Q_ORGANIZER_EXPORT QDataStream& operator<<(QDataStream& out, const QOrganiz erItemSortOrder& sortOrder); | |||
Q_ORGANIZER_EXPORT QDataStream& operator>>(QDataStream& in, QOrganizerItemS ortOrder& sortOrder); | Q_ORGANIZER_EXPORT QDataStream& operator>>(QDataStream& in, QOrganizerItemS ortOrder& sortOrder); | |||
#endif | #endif | |||
#ifndef QT_NO_DEBUG_STREAM | ||||
Q_ORGANIZER_EXPORT QDebug operator<<(QDebug dbg, const QOrganizerItemSortOr | ||||
der& sortOrder); | ||||
#endif | ||||
QTM_END_NAMESPACE | QTM_END_NAMESPACE | |||
Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QOrganizerItemSortOrder), Q_MOVABL E_TYPE); | Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QOrganizerItemSortOrder), Q_MOVABL E_TYPE); | |||
#endif | #endif | |||
End of changes. 4 change blocks. | ||||
14 lines changed or deleted | 19 lines changed or added | |||
qorganizeritemtag.h | qorganizeritemtag.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMTAG_H | #ifndef QORGANIZERITEMTAG_H | |||
#define QORGANIZERITEMTAG_H | #define QORGANIZERITEMTAG_H | |||
#include <QString> | #include <QString> | |||
#include "qtorganizerglobal.h" | #include "qtorganizerglobal.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizeritemtimestamp.h | qorganizeritemtimestamp.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMTIMESTAMP_H | #ifndef QORGANIZERITEMTIMESTAMP_H | |||
#define QORGANIZERITEMTIMESTAMP_H | #define QORGANIZERITEMTIMESTAMP_H | |||
#include <QString> | #include <QString> | |||
#include "qtorganizerglobal.h" | #include "qtorganizerglobal.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizeritemtype.h | qorganizeritemtype.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMTYPE_H | #ifndef QORGANIZERITEMTYPE_H | |||
#define QORGANIZERITEMTYPE_H | #define QORGANIZERITEMTYPE_H | |||
#include <QString> | #include <QString> | |||
#include "qtorganizerglobal.h" | #include "qtorganizerglobal.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizeritemunionfilter.h | qorganizeritemunionfilter.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMUNIONFILTER_H | #ifndef QORGANIZERITEMUNIONFILTER_H | |||
#define QORGANIZERITEMUNIONFILTER_H | #define QORGANIZERITEMUNIONFILTER_H | |||
#include "qorganizeritemfilter.h" | #include "qorganizeritemfilter.h" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizeritemvisualreminder.h | qorganizeritemvisualreminder.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERITEMVISUALREMINDER_H | #ifndef QORGANIZERITEMVISUALREMINDER_H | |||
#define QORGANIZERITEMVISUALREMINDER_H | #define QORGANIZERITEMVISUALREMINDER_H | |||
#include "qorganizeritemreminder.h" | #include "qorganizeritemreminder.h" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizerjournal.h | qorganizerjournal.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERJOURNAL_H | #ifndef QORGANIZERJOURNAL_H | |||
#define QORGANIZERJOURNAL_H | #define QORGANIZERJOURNAL_H | |||
#include "qtorganizer.h" | #include "qtorganizer.h" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
class Q_ORGANIZER_EXPORT QOrganizerJournal : public QOrganizerItem | class Q_ORGANIZER_EXPORT QOrganizerJournal : public QOrganizerItem | |||
{ | { | |||
public: | public: | |||
#if !Q_QDOC | ||||
#ifdef Q_QDOC | ||||
static const QLatin1Constant QOrganizerJournal; | ||||
#else | ||||
Q_DECLARE_CUSTOM_ORGANIZER_ITEM(QOrganizerJournal, QOrganizerItemType:: TypeJournal) | Q_DECLARE_CUSTOM_ORGANIZER_ITEM(QOrganizerJournal, QOrganizerItemType:: TypeJournal) | |||
#endif | #endif | |||
void setDateTime(const QDateTime& dateTime); | void setDateTime(const QDateTime& dateTime); | |||
QDateTime dateTime() const; | QDateTime dateTime() const; | |||
}; | }; | |||
QTM_END_NAMESPACE | QTM_END_NAMESPACE | |||
#endif | #endif | |||
End of changes. 4 change blocks. | ||||
15 lines changed or deleted | 18 lines changed or added | |||
qorganizerjournaltime.h | qorganizerjournaltime.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERJOURNALTIME_H | #ifndef QORGANIZERJOURNALTIME_H | |||
#define QORGANIZERJOURNALTIME_H | #define QORGANIZERJOURNALTIME_H | |||
#include <QString> | #include <QString> | |||
#include "qtorganizerglobal.h" | #include "qtorganizerglobal.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizermanager.h | qorganizermanager.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERMANAGER_H | #ifndef QORGANIZERMANAGER_H | |||
#define QORGANIZERMANAGER_H | #define QORGANIZERMANAGER_H | |||
#include <QObject> | #include <QObject> | |||
#include <QMap> | #include <QMap> | |||
skipping to change at line 107 | skipping to change at line 108 | |||
DetailAccessError, | DetailAccessError, | |||
PermissionsError, | PermissionsError, | |||
OutOfMemoryError, | OutOfMemoryError, | |||
NotSupportedError, | NotSupportedError, | |||
BadArgumentError, | BadArgumentError, | |||
UnspecifiedError, | UnspecifiedError, | |||
VersionMismatchError, | VersionMismatchError, | |||
LimitReachedError, | LimitReachedError, | |||
InvalidItemTypeError, | InvalidItemTypeError, | |||
InvalidCollectionError, | InvalidCollectionError, | |||
InvalidOccurrenceError | InvalidOccurrenceError, | |||
TimeoutError | ||||
}; | }; | |||
/* Error reporting */ | /* Error reporting */ | |||
QOrganizerManager::Error error() const; | QOrganizerManager::Error error() const; | |||
QMap<int, QOrganizerManager::Error> errorMap() const; | QMap<int, QOrganizerManager::Error> errorMap() const; | |||
QList<QOrganizerItem> itemOccurrences(const QOrganizerItem& parentItem, const QDateTime& periodStart = QDateTime(), const QDateTime& periodEnd = Q DateTime(), int maxCount = -1, const QOrganizerItemFetchHint& fetchHint = Q OrganizerItemFetchHint()) const; | QList<QOrganizerItem> itemOccurrences(const QOrganizerItem& parentItem, const QDateTime& periodStart = QDateTime(), const QDateTime& periodEnd = Q DateTime(), int maxCount = -1, const QOrganizerItemFetchHint& fetchHint = Q OrganizerItemFetchHint()) const; | |||
/* Items - Accessors and Mutators */ | /* Items - Accessors and Mutators */ | |||
QList<QOrganizerItemId> itemIds(const QOrganizerItemFilter& filter = QO rganizerItemFilter(), const QList<QOrganizerItemSortOrder>& sortOrders = QL ist<QOrganizerItemSortOrder>()) const; | QList<QOrganizerItemId> itemIds(const QOrganizerItemFilter& filter = QO rganizerItemFilter(), const QList<QOrganizerItemSortOrder>& sortOrders = QL ist<QOrganizerItemSortOrder>()) const; | |||
QList<QOrganizerItemId> itemIds(const QDateTime& startDate, const QDate Time& endDate, const QOrganizerItemFilter& filter = QOrganizerItemFilter(), const QList<QOrganizerItemSortOrder>& sortOrders = QList<QOrganizerItemSor tOrder>()) const; | QList<QOrganizerItemId> itemIds(const QDateTime& startDate, const QDate Time& endDate, const QOrganizerItemFilter& filter = QOrganizerItemFilter(), const QList<QOrganizerItemSortOrder>& sortOrders = QList<QOrganizerItemSor tOrder>()) const; | |||
QList<QOrganizerItem> items(const QOrganizerItemFilter& filter = QOrgan izerItemFilter(), const QList<QOrganizerItemSortOrder>& sortOrders = QList< QOrganizerItemSortOrder>(), const QOrganizerItemFetchHint& fetchHint = QOrg anizerItemFetchHint()) const; | QList<QOrganizerItem> items(const QOrganizerItemFilter& filter = QOrgan izerItemFilter(), const QList<QOrganizerItemSortOrder>& sortOrders = QList< QOrganizerItemSortOrder>(), const QOrganizerItemFetchHint& fetchHint = QOrg anizerItemFetchHint()) const; | |||
QList<QOrganizerItem> items(const QDateTime& startDate, const QDateTime & endDate, const QOrganizerItemFilter& filter = QOrganizerItemFilter(), con st QList<QOrganizerItemSortOrder>& sortOrders = QList<QOrganizerItemSortOrd er>(), const QOrganizerItemFetchHint& fetchHint = QOrganizerItemFetchHint() ) const; | QList<QOrganizerItem> items(const QDateTime& startDate, const QDateTime & endDate, const QOrganizerItemFilter& filter = QOrganizerItemFilter(), con st QList<QOrganizerItemSortOrder>& sortOrders = QList<QOrganizerItemSortOrd er>(), const QOrganizerItemFetchHint& fetchHint = QOrganizerItemFetchHint() ) const; | |||
QList<QOrganizerItem> items(const QDateTime& startDate, const QDateTime & endDate, int maxCount, const QOrganizerItemFilter& filter = QOrganizerIte mFilter(), const QOrganizerItemFetchHint& fetchHint = QOrganizerItemFetchHi nt()) const; | ||||
QList<QOrganizerItem> itemsForExport(const QDateTime& startDate = QDate Time(), const QDateTime& endDate = QDateTime(), const QOrganizerItemFilter& filter = QOrganizerItemFilter(), const QList<QOrganizerItemSortOrder>& sor tOrders = QList<QOrganizerItemSortOrder>(), const QOrganizerItemFetchHint& fetchHint = QOrganizerItemFetchHint()) const; | QList<QOrganizerItem> itemsForExport(const QDateTime& startDate = QDate Time(), const QDateTime& endDate = QDateTime(), const QOrganizerItemFilter& filter = QOrganizerItemFilter(), const QList<QOrganizerItemSortOrder>& sor tOrders = QList<QOrganizerItemSortOrder>(), const QOrganizerItemFetchHint& fetchHint = QOrganizerItemFetchHint()) const; | |||
QOrganizerItem item(const QOrganizerItemId& itemId, const QOrganizerIte mFetchHint& fetchHint = QOrganizerItemFetchHint()) const; // retrieve an i tem | QOrganizerItem item(const QOrganizerItemId& itemId, const QOrganizerIte mFetchHint& fetchHint = QOrganizerItemFetchHint()) const; // retrieve an i tem | |||
bool saveItem(QOrganizerItem* item); | bool saveItem(QOrganizerItem* item); | |||
bool saveItems(QList<QOrganizerItem>* items); | bool saveItems(QList<QOrganizerItem>* items); | |||
bool saveItems(QList<QOrganizerItem>* items, const QStringList& definit ionMask); | ||||
bool removeItem(const QOrganizerItemId& itemId); | bool removeItem(const QOrganizerItemId& itemId); | |||
bool removeItems(const QList<QOrganizerItemId>& itemIds); | bool removeItems(const QList<QOrganizerItemId>& itemIds); | |||
/* Collections - every item belongs to one or more collections */ | /* Collections - every item belongs to one or more collections */ | |||
QOrganizerCollection defaultCollection() const; | QOrganizerCollection defaultCollection() const; | |||
QOrganizerCollection collection(const QOrganizerCollectionId& collectio nId) const; | QOrganizerCollection collection(const QOrganizerCollectionId& collectio nId) const; | |||
QList<QOrganizerCollection> collections() const; | QList<QOrganizerCollection> collections() const; | |||
bool saveCollection(QOrganizerCollection* collection); | bool saveCollection(QOrganizerCollection* collection); | |||
bool removeCollection(const QOrganizerCollectionId& collectionId); | bool removeCollection(const QOrganizerCollectionId& collectionId); | |||
skipping to change at line 176 | skipping to change at line 180 | |||
void itemsChanged(const QList<QOrganizerItemId>& itemIds); | void itemsChanged(const QList<QOrganizerItemId>& itemIds); | |||
void itemsRemoved(const QList<QOrganizerItemId>& itemIds); | void itemsRemoved(const QList<QOrganizerItemId>& itemIds); | |||
void collectionsAdded(const QList<QOrganizerCollectionId>& collectionId s); | void collectionsAdded(const QList<QOrganizerCollectionId>& collectionId s); | |||
void collectionsChanged(const QList<QOrganizerCollectionId>& collection Ids); | void collectionsChanged(const QList<QOrganizerCollectionId>& collection Ids); | |||
void collectionsRemoved(const QList<QOrganizerCollectionId>& collection Ids); | void collectionsRemoved(const QList<QOrganizerCollectionId>& collection Ids); | |||
private: | private: | |||
friend class QOrganizerManagerData; | friend class QOrganizerManagerData; | |||
void createEngine(const QString& managerName, const QMap<QString, QStri ng>& parameters); | void createEngine(const QString& managerName, const QMap<QString, QStri ng>& parameters); | |||
Q_DISABLE_COPY(QOrganizerManager) | Q_DISABLE_COPY(QOrganizerManager) | |||
Q_PRIVATE_SLOT(d, void _q_itemsUpdated(const QList<QOrganizerItemId>& i | ||||
ds)); | ||||
Q_PRIVATE_SLOT(d, void _q_itemsDeleted(const QList<QOrganizerItemId>& i | ||||
ds)); | ||||
// private data pointer | // private data pointer | |||
QOrganizerManagerData* d; | QOrganizerManagerData* d; | |||
}; | }; | |||
QTM_END_NAMESPACE | QTM_END_NAMESPACE | |||
#endif | #endif | |||
End of changes. 7 change blocks. | ||||
15 lines changed or deleted | 24 lines changed or added | |||
qorganizermanagerengine.h | qorganizermanagerengine.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERMANAGERENGINE_H | #ifndef QORGANIZERMANAGERENGINE_H | |||
#define QORGANIZERMANAGERENGINE_H | #define QORGANIZERMANAGERENGINE_H | |||
#include <QSharedData> | #include <QSharedData> | |||
#include <QMap> | #include <QMap> | |||
#include <QSet> | #include <QSet> | |||
skipping to change at line 176 | skipping to change at line 176 | |||
static void updateCollectionRemoveRequest(QOrganizerCollectionRemoveReq uest* req, QOrganizerManager::Error error, const QMap<int, QOrganizerManage r::Error>& errorMap, QOrganizerAbstractRequest::State newState); | static void updateCollectionRemoveRequest(QOrganizerCollectionRemoveReq uest* req, QOrganizerManager::Error error, const QMap<int, QOrganizerManage r::Error>& errorMap, QOrganizerAbstractRequest::State newState); | |||
static void updateCollectionSaveRequest(QOrganizerCollectionSaveRequest * req, const QList<QOrganizerCollection>& result, QOrganizerManager::Error error, const QMap<int, QOrganizerManager::Error>& errorMap, QOrganizerAbstr actRequest::State newState); | static void updateCollectionSaveRequest(QOrganizerCollectionSaveRequest * req, const QList<QOrganizerCollection>& result, QOrganizerManager::Error error, const QMap<int, QOrganizerManager::Error>& errorMap, QOrganizerAbstr actRequest::State newState); | |||
// Other protected area update functions | // Other protected area update functions | |||
static void setDetailAccessConstraints(QOrganizerItemDetail* detail, QO rganizerItemDetail::AccessConstraints constraints); | static void setDetailAccessConstraints(QOrganizerItemDetail* detail, QO rganizerItemDetail::AccessConstraints constraints); | |||
static const QOrganizerItemEngineId* engineItemId(const QOrganizerItemI d& id); | static const QOrganizerItemEngineId* engineItemId(const QOrganizerItemI d& id); | |||
static const QOrganizerCollectionEngineId* engineCollectionId(const QOr ganizerCollectionId& id); | static const QOrganizerCollectionEngineId* engineCollectionId(const QOr ganizerCollectionId& id); | |||
/* Helper functions */ | /* Helper functions */ | |||
static bool isItemBetweenDates(const QOrganizerItem& item, const QDateT ime& startPeriod, const QDateTime& endPeriod); | static bool isItemBetweenDates(const QOrganizerItem& item, const QDateT ime& startPeriod, const QDateTime& endPeriod); | |||
static bool itemLessThan(const QOrganizerItem& a, const QOrganizerItem& b); | ||||
static int compareItem(const QOrganizerItem& a, const QOrganizerItem& b , const QList<QOrganizerItemSortOrder>& sortOrders); | static int compareItem(const QOrganizerItem& a, const QOrganizerItem& b , const QList<QOrganizerItemSortOrder>& sortOrders); | |||
static void addSorted(QList<QOrganizerItem>* sorted, const QOrganizerIt em& toAdd, const QList<QOrganizerItemSortOrder>& sortOrders); | static void addSorted(QList<QOrganizerItem>* sorted, const QOrganizerIt em& toAdd, const QList<QOrganizerItemSortOrder>& sortOrders); | |||
static int compareVariant(const QVariant& first, const QVariant& second , Qt::CaseSensitivity sensitivity); | static int compareVariant(const QVariant& first, const QVariant& second , Qt::CaseSensitivity sensitivity); | |||
static bool testFilter(const QOrganizerItemFilter& filter, const QOrgan izerItem& item); | static bool testFilter(const QOrganizerItemFilter& filter, const QOrgan izerItem& item); | |||
static QOrganizerItemFilter canonicalizedFilter(const QOrganizerItemFil ter& filter); | static QOrganizerItemFilter canonicalizedFilter(const QOrganizerItemFil ter& filter); | |||
private: | private: | |||
/* QOrganizerItemChangeSet is a utility class used to emit the appropri ate signals */ | /* QOrganizerItemChangeSet is a utility class used to emit the appropri ate signals */ | |||
friend class QOrganizerItemChangeSet; | friend class QOrganizerItemChangeSet; | |||
friend class QOrganizerCollectionChangeSet; | friend class QOrganizerCollectionChangeSet; | |||
}; | }; | |||
class Q_ORGANIZER_EXPORT QOrganizerManagerEngineV2 : public QOrganizerManag | ||||
erEngine | ||||
{ | ||||
Q_OBJECT | ||||
public: | ||||
QOrganizerManagerEngineV2() : QOrganizerManagerEngine() {} | ||||
// This is the V1 function - c++ overloading rules require this here, o | ||||
r to use "using" | ||||
virtual QList<QOrganizerItem> items(const QDateTime& startDate, const Q | ||||
DateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganiz | ||||
erItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint, QOr | ||||
ganizerManager::Error* error) const; | ||||
virtual QList<QOrganizerItem> items(const QDateTime& startDate, const Q | ||||
DateTime& endDate, int maxCount, const QOrganizerItemFilter& filter, const | ||||
QOrganizerItemFetchHint& fetchHint, QOrganizerManager::Error* error) const; | ||||
// Again, this is the v1 function | ||||
QList<QOrganizerItem> itemsForExport(const QDateTime& startDate, const | ||||
QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrgani | ||||
zerItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint, QO | ||||
rganizerManager::Error* error) const; | ||||
virtual QList<QOrganizerItem> itemsForExport(const QList<QOrganizerItem | ||||
Id>& itemIds, const QOrganizerItemFetchHint& fetchHint, QMap<int, QOrganize | ||||
rManager::Error>* errorMap, QOrganizerManager::Error* error) const; | ||||
// Again, this is the v1 function | ||||
bool saveItems(QList<QOrganizerItem>* items, QMap<int, QOrganizerManage | ||||
r::Error>* errorMap, QOrganizerManager::Error* error); | ||||
virtual bool saveItems(QList<QOrganizerItem>* items, const QStringList& | ||||
definitionMask, QMap<int, QOrganizerManager::Error>* errorMap, QOrganizerM | ||||
anager::Error* error); | ||||
static void updateItemFetchByIdRequest(QOrganizerItemFetchByIdRequest* | ||||
req, const QList<QOrganizerItem>& result, QOrganizerManager::Error error, c | ||||
onst QMap<int, QOrganizerManager::Error>& errorMap, QOrganizerAbstractReque | ||||
st::State); | ||||
// TODO async function | ||||
}; | ||||
QTM_END_NAMESPACE | QTM_END_NAMESPACE | |||
#endif | #endif | |||
End of changes. 5 change blocks. | ||||
14 lines changed or deleted | 56 lines changed or added | |||
qorganizermanagerenginefactory.h | qorganizermanagerenginefactory.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERMANAGERENGINEFACTORY_H | #ifndef QORGANIZERMANAGERENGINEFACTORY_H | |||
#define QORGANIZERMANAGERENGINEFACTORY_H | #define QORGANIZERMANAGERENGINEFACTORY_H | |||
#include <QtPlugin> | #include <QtPlugin> | |||
#include <QMap> | #include <QMap> | |||
#include <QString> | #include <QString> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizernote.h | qorganizernote.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERNOTE_H | #ifndef QORGANIZERNOTE_H | |||
#define QORGANIZERNOTE_H | #define QORGANIZERNOTE_H | |||
#include "qtorganizer.h" | #include "qtorganizer.h" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
class Q_ORGANIZER_EXPORT QOrganizerNote : public QOrganizerItem | class Q_ORGANIZER_EXPORT QOrganizerNote : public QOrganizerItem | |||
{ | { | |||
public: | public: | |||
#if !Q_QDOC | ||||
#ifdef Q_QDOC | ||||
static const QLatin1Constant QOrganizerNote; | ||||
#else | ||||
Q_DECLARE_CUSTOM_ORGANIZER_ITEM(QOrganizerNote, QOrganizerItemType::Typ eNote) | Q_DECLARE_CUSTOM_ORGANIZER_ITEM(QOrganizerNote, QOrganizerItemType::Typ eNote) | |||
#endif | #endif | |||
}; | }; | |||
QTM_END_NAMESPACE | QTM_END_NAMESPACE | |||
#endif | #endif | |||
End of changes. 4 change blocks. | ||||
15 lines changed or deleted | 18 lines changed or added | |||
qorganizerrecurrencerule.h | qorganizerrecurrencerule.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERRECURRENCERULE_H | #ifndef QORGANIZERRECURRENCERULE_H | |||
#define QORGANIZERRECURRENCERULE_H | #define QORGANIZERRECURRENCERULE_H | |||
#include <QString> | #include <QString> | |||
#include <QDateTime> | #include <QDateTime> | |||
#include <QSet> | #include <QSet> | |||
skipping to change at line 142 | skipping to change at line 142 | |||
void setPositions(const QSet<int>& pos); | void setPositions(const QSet<int>& pos); | |||
QSet<int> positions() const; | QSet<int> positions() const; | |||
private: | private: | |||
QSharedDataPointer<QOrganizerRecurrenceRulePrivate> d; | QSharedDataPointer<QOrganizerRecurrenceRulePrivate> d; | |||
}; | }; | |||
//hash functions | //hash functions | |||
Q_ORGANIZER_EXPORT uint qHash(const QOrganizerRecurrenceRule& rule); | Q_ORGANIZER_EXPORT uint qHash(const QOrganizerRecurrenceRule& rule); | |||
#ifndef QT_NO_DEBUG_STREAM | ||||
Q_ORGANIZER_EXPORT QDebug operator<<(QDebug dbg, const QOrganizerRecurrence | ||||
Rule& rule); | ||||
#endif | ||||
inline uint qHash(QOrganizerRecurrenceRule::Month month) | inline uint qHash(QOrganizerRecurrenceRule::Month month) | |||
{ | { | |||
return static_cast<uint>(month); | return static_cast<uint>(month); | |||
} | } | |||
QTM_END_NAMESPACE | QTM_END_NAMESPACE | |||
inline uint qHash(const QDate &date) | inline uint qHash(const QDate &date) | |||
{ | { | |||
return date.toJulianDay(); | return date.toJulianDay(); | |||
End of changes. 4 change blocks. | ||||
14 lines changed or deleted | 19 lines changed or added | |||
qorganizertodo.h | qorganizertodo.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERTODO_H | #ifndef QORGANIZERTODO_H | |||
#define QORGANIZERTODO_H | #define QORGANIZERTODO_H | |||
#include "qtorganizer.h" | #include "qtorganizer.h" | |||
#include "qorganizeritemrecurrence.h" | #include "qorganizeritemrecurrence.h" | |||
#include "qorganizertodoprogress.h" | #include "qorganizertodoprogress.h" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
class Q_ORGANIZER_EXPORT QOrganizerTodo : public QOrganizerItem | class Q_ORGANIZER_EXPORT QOrganizerTodo : public QOrganizerItem | |||
{ | { | |||
public: | public: | |||
#if !Q_QDOC | ||||
#ifdef Q_QDOC | ||||
static const QLatin1Constant QOrganizerTodo; | ||||
#else | ||||
Q_DECLARE_CUSTOM_ORGANIZER_ITEM(QOrganizerTodo, QOrganizerItemType::Typ eTodo) | Q_DECLARE_CUSTOM_ORGANIZER_ITEM(QOrganizerTodo, QOrganizerItemType::Typ eTodo) | |||
#endif | #endif | |||
// XXX TODO: some questions about "recurring periods and doneness"... | // XXX TODO: some questions about "recurring periods and doneness"... | |||
void setStartDateTime(const QDateTime& dueDateTime); | void setStartDateTime(const QDateTime& dueDateTime); | |||
QDateTime startDateTime() const; | QDateTime startDateTime() const; | |||
void setDueDateTime(const QDateTime& dueDateTime); | void setDueDateTime(const QDateTime& dueDateTime); | |||
QDateTime dueDateTime() const; | QDateTime dueDateTime() const; | |||
void setAllDay(bool isAllDay); | void setAllDay(bool isAllDay); | |||
End of changes. 4 change blocks. | ||||
15 lines changed or deleted | 18 lines changed or added | |||
qorganizertodooccurrence.h | qorganizertodooccurrence.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERTODOOCCURRENCE_H | #ifndef QORGANIZERTODOOCCURRENCE_H | |||
#define QORGANIZERTODOOCCURRENCE_H | #define QORGANIZERTODOOCCURRENCE_H | |||
#include "qtorganizer.h" | #include "qtorganizer.h" | |||
#include "qorganizertodoprogress.h" | #include "qorganizertodoprogress.h" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
class Q_ORGANIZER_EXPORT QOrganizerTodoOccurrence : public QOrganizerItem | class Q_ORGANIZER_EXPORT QOrganizerTodoOccurrence : public QOrganizerItem | |||
{ | { | |||
public: | public: | |||
#if !Q_QDOC | ||||
#ifdef Q_QDOC | ||||
static const QLatin1Constant QOrganizerTodoOccurrence; | ||||
#else | ||||
Q_DECLARE_CUSTOM_ORGANIZER_ITEM(QOrganizerTodoOccurrence, QOrganizerIte mType::TypeTodoOccurrence) | Q_DECLARE_CUSTOM_ORGANIZER_ITEM(QOrganizerTodoOccurrence, QOrganizerIte mType::TypeTodoOccurrence) | |||
#endif | #endif | |||
// XXX TODO: see discussion in qorganizertodo.h | // XXX TODO: see discussion in qorganizertodo.h | |||
void setStartDateTime(const QDateTime& startDateTime); | void setStartDateTime(const QDateTime& startDateTime); | |||
QDateTime startDateTime() const; | QDateTime startDateTime() const; | |||
void setDueDateTime(const QDateTime& dueDateTime); | void setDueDateTime(const QDateTime& dueDateTime); | |||
QDateTime dueDateTime() const; | QDateTime dueDateTime() const; | |||
void setParentId(const QOrganizerItemId& parentId); | void setParentId(const QOrganizerItemId& parentId); | |||
End of changes. 4 change blocks. | ||||
15 lines changed or deleted | 18 lines changed or added | |||
qorganizertodoprogress.h | qorganizertodoprogress.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERTODOPROGRESS_H | #ifndef QORGANIZERTODOPROGRESS_H | |||
#define QORGANIZERTODOPROGRESS_H | #define QORGANIZERTODOPROGRESS_H | |||
#include <QString> | #include <QString> | |||
#include "qtorganizerglobal.h" | #include "qtorganizerglobal.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorganizertodotime.h | qorganizertodotime.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QORGANIZERTODOTIME_H | #ifndef QORGANIZERTODOTIME_H | |||
#define QORGANIZERTODOTIME_H | #define QORGANIZERTODOTIME_H | |||
#include <QString> | #include <QString> | |||
#include "qtorganizerglobal.h" | #include "qtorganizerglobal.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qorientationsensor.h | qorientationsensor.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qproximitysensor.h | qproximitysensor.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qradiotuner.h | qradiotuner.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QRADIOTUNER_H | #ifndef QRADIOTUNER_H | |||
#define QRADIOTUNER_H | #define QRADIOTUNER_H | |||
#include <QtCore/qobject.h> | #include <QtCore/qobject.h> | |||
#include "qmediaobject.h" | #include "qmediaobject.h" | |||
#include "qmediaserviceprovider.h" | #include "qmediaserviceprovider.h" | |||
#include <qmediaenumdebug.h> | ||||
#include <QPair> | #include <QPair> | |||
QT_BEGIN_NAMESPACE | QT_BEGIN_NAMESPACE | |||
class QRadioTunerPrivate; | class QRadioTunerPrivate; | |||
class Q_MULTIMEDIA_EXPORT QRadioTuner : public QMediaObject | class Q_MULTIMEDIA_EXPORT QRadioTuner : public QMediaObject | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
Q_PROPERTY(State state READ state NOTIFY stateChanged) | Q_PROPERTY(State state READ state NOTIFY stateChanged) | |||
skipping to change at line 145 | skipping to change at line 146 | |||
Q_DECLARE_PRIVATE(QRadioTuner) | Q_DECLARE_PRIVATE(QRadioTuner) | |||
}; | }; | |||
QT_END_NAMESPACE | QT_END_NAMESPACE | |||
Q_DECLARE_METATYPE(QRadioTuner::State) | Q_DECLARE_METATYPE(QRadioTuner::State) | |||
Q_DECLARE_METATYPE(QRadioTuner::Band) | Q_DECLARE_METATYPE(QRadioTuner::Band) | |||
Q_DECLARE_METATYPE(QRadioTuner::Error) | Q_DECLARE_METATYPE(QRadioTuner::Error) | |||
Q_DECLARE_METATYPE(QRadioTuner::StereoMode) | Q_DECLARE_METATYPE(QRadioTuner::StereoMode) | |||
Q_MEDIA_ENUM_DEBUG(QRadioTuner, State) | ||||
Q_MEDIA_ENUM_DEBUG(QRadioTuner, Band) | ||||
Q_MEDIA_ENUM_DEBUG(QRadioTuner, Error) | ||||
Q_MEDIA_ENUM_DEBUG(QRadioTuner, StereoMode) | ||||
#endif // QRADIOPLAYER_H | #endif // QRADIOPLAYER_H | |||
End of changes. 5 change blocks. | ||||
14 lines changed or deleted | 20 lines changed or added | |||
qradiotunercontrol.h | qradiotunercontrol.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QRADIOTUNERCONTROL_H | #ifndef QRADIOTUNERCONTROL_H | |||
#define QRADIOTUNERCONTROL_H | #define QRADIOTUNERCONTROL_H | |||
#include "qmediacontrol.h" | #include "qmediacontrol.h" | |||
#include "qradiotuner.h" | #include "qradiotuner.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qremoteserviceregister.h | qremoteserviceregister.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QREMOTESERVICEREGISTER_H | #ifndef QREMOTESERVICEREGISTER_H | |||
#define QREMOTESERVICEREGISTER_H | #define QREMOTESERVICEREGISTER_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include <QObject> | #include <QObject> | |||
#include <QQueue> | #include <QQueue> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qrotationsensor.h | qrotationsensor.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qsensor.h | qsensor.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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 <QtCore/QObject> | #include <QtCore/QObject> | |||
#include <QtCore/QByteArray> | #include <QtCore/QByteArray> | |||
skipping to change at line 132 | skipping to change at line 132 | |||
qoutputrangelist outputRanges() const; | qoutputrangelist outputRanges() const; | |||
int outputRange() const; | int outputRange() const; | |||
void setOutputRange(int index); | void setOutputRange(int index); | |||
QString description() const; | QString description() const; | |||
int error() const; | int error() const; | |||
// Filters modify the reading | // Filters modify the reading | |||
void addFilter(QSensorFilter *filter); | void addFilter(QSensorFilter *filter); | |||
void removeFilter(QSensorFilter *filter); | void removeFilter(QSensorFilter *filter); | |||
QList<QSensorFilter*> filters() const; | ||||
// The readings are exposed via this object | // The readings are exposed via this object | |||
QSensorReading *reading() const; | QSensorReading *reading() const; | |||
// Information about available sensors | // Information about available sensors | |||
// These functions are implemented in qsensormanager.cpp | // These functions are implemented in qsensormanager.cpp | |||
static QList<QByteArray> sensorTypes(); | static QList<QByteArray> sensorTypes(); | |||
static QList<QByteArray> sensorsForType(const QByteArray &type); | static QList<QByteArray> sensorsForType(const QByteArray &type); | |||
static QByteArray defaultSensorForType(const QByteArray &type); | static QByteArray defaultSensorForType(const QByteArray &type); | |||
skipping to change at line 154 | skipping to change at line 155 | |||
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 activeChanged(); | |||
void readingChanged(); | void readingChanged(); | |||
void sensorError(int error); | void sensorError(int error); | |||
void availableSensorsChanged(); | ||||
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: | |||
void registerInstance(); | ||||
QScopedPointer<QSensorPrivate> d; | QScopedPointer<QSensorPrivate> d; | |||
Q_DISABLE_COPY(QSensor) | Q_DISABLE_COPY(QSensor) | |||
}; | }; | |||
class Q_SENSORS_EXPORT QSensorFilter | class Q_SENSORS_EXPORT QSensorFilter | |||
{ | { | |||
friend class QSensor; | friend class QSensor; | |||
public: | public: | |||
virtual bool filter(QSensorReading *reading) = 0; | virtual bool filter(QSensorReading *reading) = 0; | |||
protected: | protected: | |||
skipping to change at line 195 | skipping to change at line 199 | |||
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); | |||
private: | private: | |||
QScopedPointer<QSensorReadingPrivate> d; | QScopedPointer<QSensorReadingPrivate> d; | |||
Q_DISABLE_COPY(QSensorReading) | Q_DISABLE_COPY(QSensorReading) | |||
}; | }; | |||
#define DECLARE_READING(classname)\ | #define DECLARE_READING(classname)\ | |||
DECLARE_READING_D(classname, classname ## Private) | DECLARE_READING_D(classname, classname ## Private) | |||
End of changes. 7 change blocks. | ||||
14 lines changed or deleted | 19 lines changed or added | |||
qsensorbackend.h | qsensorbackend.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QSENSORBACKEND_H | #ifndef QSENSORBACKEND_H | |||
#define QSENSORBACKEND_H | #define QSENSORBACKEND_H | |||
#include "qsensor.h" | #include "qsensor.h" | |||
#include "qsensormanager.h" | #include "qsensormanager.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qsensormanager.h | qsensormanager.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
skipping to change at line 60 | skipping to change at line 60 | |||
class QSensorBackendFactory; | class QSensorBackendFactory; | |||
class QSensorPluginInterface; | class QSensorPluginInterface; | |||
typedef QSensorPluginInterface *(*CreatePluginFunc)(); | typedef QSensorPluginInterface *(*CreatePluginFunc)(); | |||
class Q_SENSORS_EXPORT QSensorManager | class Q_SENSORS_EXPORT QSensorManager | |||
{ | { | |||
public: | public: | |||
// Register a backend (call this from a plugin) | // Register a backend (call this from a plugin) | |||
static void registerBackend(const QByteArray &type, const QByteArray &i dentifier, QSensorBackendFactory *factory); | static void registerBackend(const QByteArray &type, const QByteArray &i dentifier, QSensorBackendFactory *factory); | |||
static void unregisterBackend(const QByteArray &type, const QByteArray | ||||
&identifier); | ||||
static bool isBackendRegistered(const QByteArray &type, const QByteArra | ||||
y &identifier); | ||||
// Create a backend (uses the type and identifier set in the sensor) | // Create a backend (uses the type and identifier set in the sensor) | |||
static QSensorBackend *createBackend(QSensor *sensor); | static QSensorBackend *createBackend(QSensor *sensor); | |||
// For static plugins | // For static plugins | |||
static void registerStaticPlugin(CreatePluginFunc func); | static void registerStaticPlugin(CreatePluginFunc func); | |||
}; | }; | |||
class Q_SENSORS_EXPORT QSensorBackendFactory | class Q_SENSORS_EXPORT QSensorBackendFactory | |||
{ | { | |||
public: | public: | |||
virtual QSensorBackend *createBackend(QSensor *sensor) = 0; | virtual QSensorBackend *createBackend(QSensor *sensor) = 0; | |||
protected: | protected: | |||
~QSensorBackendFactory() {} | ~QSensorBackendFactory() {} | |||
}; | }; | |||
#define REGISTER_STATIC_PLUGIN(pluginname)\ | // The default is for legacy static plugins | |||
// This will change to Qt-style static plugins in 1.3 | ||||
#define REGISTER_STATIC_PLUGIN(pluginname) \ | ||||
REGISTER_STATIC_PLUGIN_V1(pluginname) | ||||
// Legacy static plugins have their own registration methods. | ||||
// They can only register types. They cannot use the changes interface. | ||||
#define REGISTER_STATIC_PLUGIN_V1(pluginname) \ | ||||
static QSensorPluginInterface *create_static_plugin_ ## pluginname()\ | static QSensorPluginInterface *create_static_plugin_ ## pluginname()\ | |||
{\ | {\ | |||
return new pluginname;\ | return new pluginname;\ | |||
}\ | }\ | |||
static bool side_effect_sensor_backend_ ## pluginname ()\ | static bool side_effect_sensor_backend_ ## pluginname ()\ | |||
{\ | {\ | |||
QSensorManager::registerStaticPlugin(create_static_plugin_ ## plugi nname);\ | QSensorManager::registerStaticPlugin(create_static_plugin_ ## plugi nname);\ | |||
return false;\ | return false;\ | |||
}\ | }\ | |||
/* This assignment calls the function above */\ | /* This assignment calls the function above */\ | |||
static bool dummy_sensor_backend_ ## pluginname = side_effect_sensor_ba ckend_ ## pluginname(); | static bool dummy_sensor_backend_ ## pluginname = side_effect_sensor_ba ckend_ ## pluginname(); | |||
// Qt-style static plugins use macros from Qt. | ||||
// They are handled just like regular plugins. | ||||
#define REGISTER_STATIC_PLUGIN_V2(pluginname) \ | ||||
QT_PREPEND_NAMESPACE(QObject) *qt_plugin_instance_##pluginname() Q_PLUG | ||||
IN_INSTANCE(pluginname)\ | ||||
Q_IMPORT_PLUGIN(pluginname) | ||||
QTM_END_NAMESPACE | QTM_END_NAMESPACE | |||
#endif | #endif | |||
End of changes. 6 change blocks. | ||||
15 lines changed or deleted | 34 lines changed or added | |||
qsensorplugin.h | qsensorplugin.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QSENSORPLUGIN_H | #ifndef QSENSORPLUGIN_H | |||
#define QSENSORPLUGIN_H | #define QSENSORPLUGIN_H | |||
#include <QtCore/qstringlist.h> | #include <QtCore/qstringlist.h> | |||
#include <QtCore/qplugin.h> | #include <QtCore/qplugin.h> | |||
#include <QtCore/qfactoryinterface.h> | #include <QtCore/qfactoryinterface.h> | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
class QSensorBackend; | class QSensorBackend; | |||
// Plugin interface | ||||
class Q_SENSORS_EXPORT QSensorPluginInterface | class Q_SENSORS_EXPORT QSensorPluginInterface | |||
{ | { | |||
public: | public: | |||
virtual void registerSensors() = 0; | virtual void registerSensors() = 0; | |||
protected: | protected: | |||
~QSensorPluginInterface() {} | ~QSensorPluginInterface() {} | |||
}; | }; | |||
QTM_END_NAMESPACE | class Q_SENSORS_EXPORT QSensorChangesInterface | |||
{ | ||||
public: | ||||
virtual void sensorsChanged() = 0; | ||||
protected: | ||||
~QSensorChangesInterface() {} | ||||
}; | ||||
#define QSensorPluginInterface_iid \ | QTM_END_NAMESPACE | |||
"com.nokia.Qt.QSensorPluginInterface/1.0" | ||||
QT_BEGIN_NAMESPACE | QT_BEGIN_NAMESPACE | |||
Q_DECLARE_INTERFACE(QtMobility::QSensorPluginInterface, | Q_DECLARE_INTERFACE(QtMobility::QSensorPluginInterface, "com.nokia.Qt.QSens | |||
QSensorPluginInterface_iid) | orPluginInterface/1.0"); | |||
Q_DECLARE_INTERFACE(QtMobility::QSensorChangesInterface, "com.nokia.Qt.QSen | ||||
sorChangesInterface/1.0"); | ||||
QT_END_NAMESPACE | QT_END_NAMESPACE | |||
#endif | #endif | |||
End of changes. 7 change blocks. | ||||
20 lines changed or deleted | 26 lines changed or added | |||
qservice.h | qservice.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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 | QT_BEGIN_HEADER | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qservicecontext.h | qservicecontext.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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" | |||
#include <QObject> | #include <QObject> | |||
#include <QVariant> | #include <QVariant> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qservicefilter.h | qservicefilter.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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 "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include <QStringList> | #include <QStringList> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qserviceinterfacedescriptor.h | qserviceinterfacedescriptor.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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 "qmobilityglobal.h" | |||
#include <QString> | #include <QString> | |||
#include <QVariant> | #include <QVariant> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qservicemanager.h | qservicemanager.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QSERVICEMANAGER_H | #ifndef QSERVICEMANAGER_H | |||
#define QSERVICEMANAGER_H | #define QSERVICEMANAGER_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include "qservice.h" | #include "qservice.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qserviceplugininterface.h | qserviceplugininterface.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QSERVICEPLUGININTERFACE_H | #ifndef QSERVICEPLUGININTERFACE_H | |||
#define QSERVICEPLUGININTERFACE_H | #define QSERVICEPLUGININTERFACE_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include <QtPlugin> | #include <QtPlugin> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qsystemdeviceinfo.h | qsystemdeviceinfo.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QSYSTEMDEVICEINFO_H | #ifndef QSYSTEMDEVICEINFO_H | |||
#define QSYSTEMDEVICEINFO_H | #define QSYSTEMDEVICEINFO_H | |||
#include <QObject> | #include <QObject> | |||
#include <QExplicitlySharedDataPointer> | ||||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
QT_BEGIN_HEADER | QT_BEGIN_HEADER | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
class QSystemDeviceInfoPrivate; | class QSystemDeviceInfoPrivate; | |||
class Q_SYSINFO_EXPORT QSystemDeviceInfo : public QObject | class Q_SYSINFO_EXPORT QSystemDeviceInfo : public QObject | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
Q_PROPERTY(Profile currentProfile READ currentProfile NOTIFY currentPro fileChanged) | Q_PROPERTY(Profile currentProfile READ currentProfile NOTIFY currentPro fileChanged) | |||
Q_PROPERTY(PowerState powerState READ currentPowerState NOTIFY powerSta | Q_PROPERTY(PowerState currentPowerState READ currentPowerState NOTIFY p | |||
teChanged) | owerStateChanged) | |||
Q_PROPERTY(ThermalState currentThermalState READ currentThermalState NO | ||||
TIFY thermalStateChanged) | ||||
Q_PROPERTY(SimStatus simStatus READ simStatus CONSTANT) | Q_PROPERTY(SimStatus simStatus READ simStatus CONSTANT) | |||
Q_PROPERTY(BatteryStatus batteryStatus READ batteryStatus NOTIFY batter yStatusChanged) | Q_PROPERTY(BatteryStatus batteryStatus READ batteryStatus NOTIFY batter yStatusChanged) | |||
Q_PROPERTY(InputMethodFlags inputMethodType READ inputMethodType) | Q_PROPERTY(QSystemDeviceInfo::InputMethodFlags inputMethodType READ inp utMethodType) | |||
Q_PROPERTY(QString imei READ imei CONSTANT) | Q_PROPERTY(QString imei READ imei CONSTANT) | |||
Q_PROPERTY(QString imsi READ imsi CONSTANT) | Q_PROPERTY(QString imsi READ imsi CONSTANT) | |||
Q_PROPERTY(QString manufacturer READ manufacturer CONSTANT) | Q_PROPERTY(QString manufacturer READ manufacturer CONSTANT) | |||
Q_PROPERTY(QString model READ model CONSTANT) | Q_PROPERTY(QString model READ model CONSTANT) | |||
Q_PROPERTY(QString productName READ productName CONSTANT) | Q_PROPERTY(QString productName READ productName CONSTANT) | |||
Q_PROPERTY(int batteryLevel READ batteryLevel NOTIFY batteryLevelChange d) | Q_PROPERTY(int batteryLevel READ batteryLevel NOTIFY batteryLevelChange d) | |||
Q_PROPERTY(bool isDeviceLocked READ isDeviceLocked) | Q_PROPERTY(bool isDeviceLocked READ isDeviceLocked NOTIFY deviceLocked) | |||
Q_PROPERTY(bool currentBluetoothPowerState READ currentBluetoothPowerSt ate NOTIFY bluetoothStateChanged) | Q_PROPERTY(bool currentBluetoothPowerState READ currentBluetoothPowerSt ate NOTIFY bluetoothStateChanged) | |||
Q_PROPERTY(QSystemDeviceInfo::PowerState currentPowerState READ current | ||||
PowerState NOTIFY powerStateChanged) | Q_PROPERTY(KeyboardTypeFlags keyboardTypes READ keyboardTypes)//1.2 | |||
Q_PROPERTY(bool isWirelessKeyboardConnected READ isWirelessKeyboardConn | ||||
ected NOTIFY wirelessKeyboardConnected)//1.2 | ||||
Q_PROPERTY(bool isKeyboardFlippedOpen READ isKeyboardFlippedOpen NOTIFY | ||||
keyboardFlipped)//1.2 | ||||
Q_PROPERTY(QSystemDeviceInfo::LockTypeFlags lockStatus READ lockStatus | ||||
NOTIFY lockStatusChanged) | ||||
Q_PROPERTY(QByteArray uniqueDeviceID READ uniqueDeviceID CONSTANT) | ||||
Q_ENUMS(BatteryStatus) | Q_ENUMS(BatteryStatus) | |||
Q_ENUMS(PowerState) | Q_ENUMS(PowerState) | |||
Q_ENUMS(ThermalState) | ||||
Q_FLAGS(InputMethod InputMethodFlags) | Q_FLAGS(InputMethod InputMethodFlags) | |||
Q_ENUMS(SimStatus) | Q_ENUMS(SimStatus) | |||
Q_ENUMS(Profile) | Q_ENUMS(Profile) | |||
Q_ENUMS(LockType) | ||||
Q_ENUMS(KeypadType) | ||||
Q_FLAGS(KeyboardType KeyboardTypeFlags) //1.2 | ||||
Q_FLAGS(LockType LockTypeFlags) //1.2 | ||||
public: | public: | |||
explicit QSystemDeviceInfo(QObject *parent = 0); | explicit QSystemDeviceInfo(QObject *parent = 0); | |||
virtual ~QSystemDeviceInfo(); | virtual ~QSystemDeviceInfo(); | |||
enum BatteryStatus { | enum BatteryStatus { | |||
NoBatteryLevel = 0, | NoBatteryLevel = 0, | |||
BatteryCritical, | BatteryCritical, | |||
BatteryVeryLow, | BatteryVeryLow, | |||
skipping to change at line 98 | skipping to change at line 113 | |||
BatteryNormal | BatteryNormal | |||
}; | }; | |||
enum PowerState { | enum PowerState { | |||
UnknownPower = 0, | UnknownPower = 0, | |||
BatteryPower, | BatteryPower, | |||
WallPower, | WallPower, | |||
WallPowerChargingBattery | WallPowerChargingBattery | |||
}; | }; | |||
enum ThermalState { | ||||
UnknownThermal = 0, | ||||
NormalThermal, | ||||
WarningThermal, | ||||
AlertThermal, | ||||
ErrorThermal | ||||
}; | ||||
enum InputMethod { | enum InputMethod { | |||
Keys = 0x0000001, | Keys = 0x0000001, | |||
Keypad = 0x0000002, | Keypad = 0x0000002, | |||
Keyboard = 0x0000004, | Keyboard = 0x0000004, | |||
SingleTouch = 0x0000008, | SingleTouch = 0x0000008, | |||
MultiTouch = 0x0000010, | MultiTouch = 0x0000010, | |||
Mouse = 0x0000020 | Mouse = 0x0000020 | |||
}; | }; | |||
Q_DECLARE_FLAGS(InputMethodFlags, InputMethod) | 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 { | enum Profile { | |||
UnknownProfile = 0, | UnknownProfile = 0, | |||
SilentProfile, | SilentProfile, | |||
NormalProfile, | NormalProfile, | |||
LoudProfile, | LoudProfile, | |||
VibProfile, | VibProfile, | |||
OfflineProfile, | OfflineProfile, | |||
PowersaveProfile, | PowersaveProfile, | |||
CustomProfile, | CustomProfile, | |||
BeepProfile | BeepProfile | |||
}; | }; | |||
enum SimStatus { | enum SimStatus { | |||
SimNotAvailable = 0, | SimNotAvailable = 0, | |||
SingleSimAvailable, | SingleSimAvailable, | |||
DualSimAvailable, | DualSimAvailable, | |||
SimLocked | SimLocked | |||
}; | }; | |||
enum KeyboardType { | ||||
UnknownKeyboard = 0, | ||||
SoftwareKeyboard = 0x0000001, | ||||
ITUKeypad = 0x0000002, | ||||
HalfQwertyKeyboard = 0x0000004, | ||||
FullQwertyKeyboard = 0x0000008, | ||||
WirelessKeyboard = 0x0000010, | ||||
FlipKeyboard = 0x0000020 | ||||
};//1.2 | ||||
Q_DECLARE_FLAGS(KeyboardTypeFlags, KeyboardType)//1.2 | ||||
enum KeypadType { | ||||
PrimaryKeypad = 0, | ||||
SecondaryKeypad | ||||
}; //1.2 | ||||
// enum KeypadType { | ||||
// PrimaryKeypad = 0x0000001, | ||||
// SecondaryKeypad = 0x0000002 | ||||
// }; //1.2 | ||||
// Q_DECLARE_FLAGS(KeypadTypeFlags, KeypadType)//1.2 | ||||
enum LockType { | ||||
UnknownLock = 0, | ||||
PinLocked = 0x0000001, | ||||
TouchAndKeyboardLocked = 0x0000002 | ||||
}; //1.2 | ||||
Q_DECLARE_FLAGS(LockTypeFlags, LockType)//1.2 | ||||
QSystemDeviceInfo::InputMethodFlags inputMethodType(); | ||||
QString imei(); | ||||
QString imsi(); | ||||
QString manufacturer(); | ||||
QString model(); | ||||
QString productName(); | ||||
int batteryLevel() const; | ||||
QSystemDeviceInfo::BatteryStatus batteryStatus(); | ||||
bool isDeviceLocked(); | bool isDeviceLocked(); | |||
QSystemDeviceInfo::SimStatus simStatus(); | QSystemDeviceInfo::SimStatus simStatus(); | |||
QSystemDeviceInfo::Profile currentProfile(); | QSystemDeviceInfo::Profile currentProfile(); | |||
QSystemDeviceInfo::PowerState currentPowerState(); | QSystemDeviceInfo::PowerState currentPowerState(); | |||
QSystemDeviceInfo::ThermalState currentThermalState(); | ||||
bool currentBluetoothPowerState(); | bool currentBluetoothPowerState(); | |||
QSystemDeviceInfo::KeyboardTypeFlags keyboardTypes(); //1.2 | ||||
bool isWirelessKeyboardConnected(); //1.2 | ||||
bool isKeyboardFlippedOpen();//1.2 | ||||
Q_INVOKABLE bool keypadLightOn(QSystemDeviceInfo::KeypadType type); //1 | ||||
.2 | ||||
// QSystemDeviceInfo::KeypadTypeFlags keypadLightsOn(); //1.2 | ||||
QByteArray uniqueDeviceID(); //1.2 | ||||
QSystemDeviceInfo::LockTypeFlags lockStatus(); //1.2 | ||||
class Q_SYSINFO_EXPORT ProfileDetails { | ||||
public: | ||||
ProfileDetails(); | ||||
ProfileDetails(const ProfileDetails &); | ||||
ProfileDetails &operator=(const ProfileDetails &); | ||||
~ProfileDetails(); | ||||
int messageRingtoneVolume() const; | ||||
int voiceRingtoneVolume() const; | ||||
bool vibrationActive() const; | ||||
private: | ||||
friend class QSystemDeviceInfo; | ||||
}; | ||||
Q_INVOKABLE ProfileDetails activeProfileDetails();//1.2 | ||||
Q_SIGNALS: | Q_SIGNALS: | |||
void batteryLevelChanged(int level); | void batteryLevelChanged(int level); | |||
void batteryStatusChanged(QSystemDeviceInfo::BatteryStatus batteryStatu s); | void batteryStatusChanged(QSystemDeviceInfo::BatteryStatus batteryStatu s); | |||
void powerStateChanged(QSystemDeviceInfo::PowerState powerState); | void powerStateChanged(QSystemDeviceInfo::PowerState powerState); | |||
void thermalStateChanged(QSystemDeviceInfo::ThermalState thermalState); | ||||
void currentProfileChanged(QSystemDeviceInfo::Profile currentProfile); | void currentProfileChanged(QSystemDeviceInfo::Profile currentProfile); | |||
void bluetoothStateChanged(bool on); | void bluetoothStateChanged(bool on); | |||
void wirelessKeyboardConnected(bool connected);//1.2 | ||||
void keyboardFlipped(bool open);//1.2 | ||||
void deviceLocked(bool isLocked); // 1.2 | ||||
void lockStatusChanged(QSystemDeviceInfo::LockTypeFlags); //1.2 | ||||
private: | private: | |||
QSystemDeviceInfoPrivate *d; | QSystemDeviceInfoPrivate *d; | |||
QSystemDeviceInfo::ProfileDetails currentProfileDetails; | ||||
protected: | protected: | |||
void connectNotify(const char *signal); | void connectNotify(const char *signal); | |||
void disconnectNotify(const char *signal); | void disconnectNotify(const char *signal); | |||
}; | }; | |||
Q_DECLARE_OPERATORS_FOR_FLAGS(QSystemDeviceInfo::InputMethodFlags ) | Q_DECLARE_OPERATORS_FOR_FLAGS(QSystemDeviceInfo::InputMethodFlags ) | |||
QTM_END_NAMESPACE | QTM_END_NAMESPACE | |||
QT_END_HEADER | QT_END_HEADER | |||
End of changes. 19 change blocks. | ||||
31 lines changed or deleted | 120 lines changed or added | |||
qsystemdisplayinfo.h | qsystemdisplayinfo.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QSYSTEMDISPLAYINFO_H | #ifndef QSYSTEMDISPLAYINFO_H | |||
#define QSYSTEMDISPLAYINFO_H | #define QSYSTEMDISPLAYINFO_H | |||
#include <QObject> | #include <QObject> | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
QT_BEGIN_HEADER | QT_BEGIN_HEADER | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
class QSystemDisplayInfoPrivate; | class QSystemDisplayInfoPrivate; | |||
class Q_SYSINFO_EXPORT QSystemDisplayInfo : public QObject | class Q_SYSINFO_EXPORT QSystemDisplayInfo : public QObject | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
Q_ENUMS(DisplayOrientation) | Q_ENUMS(DisplayOrientation) | |||
Q_ENUMS(BacklightState) | ||||
public: | public: | |||
explicit QSystemDisplayInfo(QObject *parent = 0); | explicit QSystemDisplayInfo(QObject *parent = 0); | |||
~QSystemDisplayInfo(); | ~QSystemDisplayInfo(); | |||
// enum DisplayOrientation { | enum DisplayOrientation { | |||
// Unknown = 0, | Unknown = 0, | |||
// Landscape, | Landscape, | |||
// Portrait, | Portrait, | |||
// InvertedLandscape, | InvertedLandscape, | |||
// InvertedPortrait | InvertedPortrait | |||
// }; | }; //1.2 | |||
enum BacklightState { | ||||
BacklightStateUnknown = -1, | ||||
BacklightStateOff, | ||||
BacklightStateDimmed, | ||||
BacklightStateOn | ||||
}; //1.2 | ||||
static int displayBrightness(int screen); | static int displayBrightness(int screen); | |||
static int colorDepth(int screen); | static int colorDepth(int screen); | |||
// QSystemDisplayInfo::DisplayOrientation getOrientation(int screen); | QSystemDisplayInfo::DisplayOrientation orientation(int screen); //1.2 | |||
// float contrast(int screen); | float contrast(int screen); //1.2 | |||
// int getDPIWidth(int screen); | int getDPIWidth(int screen); //1.2 | |||
// int getDPIHeight(int screen); | int getDPIHeight(int screen); //1.2 | |||
// int physicalHeight(int screen); | int physicalHeight(int screen); //1.2 | |||
// int physicalWidth(int screen); | int physicalWidth(int screen); //1.2 | |||
QSystemDisplayInfo::BacklightState backlightStatus(int screen); //1.2 | ||||
Q_SIGNALS: | ||||
void orientationChanged(QSystemDisplayInfo::DisplayOrientation newOrien | ||||
tation); | ||||
}; | }; | |||
QTM_END_NAMESPACE | QTM_END_NAMESPACE | |||
QT_END_HEADER | QT_END_HEADER | |||
#endif // QSYSTEMDISPLAYINFO_H | #endif // QSYSTEMDISPLAYINFO_H | |||
End of changes. 10 change blocks. | ||||
30 lines changed or deleted | 42 lines changed or added | |||
qsystemgeneralinfo.h | qsystemgeneralinfo.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QSYSTEMGENERALINFO_H | #ifndef QSYSTEMGENERALINFO_H | |||
#define QSYSTEMGENERALINFO_H | #define QSYSTEMGENERALINFO_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include <QObject> | ||||
#include <QSize> | ||||
#include <QPair> | ||||
#include <QString> | #include <QString> | |||
#include <QStringList> | #include <QStringList> | |||
#include <QFileSystemWatcher> | #include <QObject> | |||
QT_BEGIN_HEADER | QT_BEGIN_HEADER | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
class QSystemInfoPrivate; | class QSystemInfoPrivate; | |||
class Q_SYSINFO_EXPORT QSystemInfo : public QObject | class Q_SYSINFO_EXPORT QSystemInfo : public QObject | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
Q_PROPERTY(QString currentLanguage READ currentLanguage NOTIFY currentL anguageChanged) | Q_PROPERTY(QString currentLanguage READ currentLanguage NOTIFY currentL anguageChanged) | |||
Q_PROPERTY(QStringList availableLanguages READ availableLanguages) | Q_PROPERTY(QStringList availableLanguages READ availableLanguages) | |||
Q_PROPERTY(QString currentCountryCode READ currentCountryCode) | Q_PROPERTY(QString currentCountryCode READ currentCountryCode) | |||
Q_ENUMS(Version) | Q_ENUMS(Version) | |||
Q_ENUMS(Feature) | Q_ENUMS(Feature) | |||
public: | public: | |||
QSystemInfo(QObject *parent = 0); | QSystemInfo(QObject *parent = 0); | |||
virtual ~QSystemInfo(); | virtual ~QSystemInfo(); | |||
QString currentLanguage(); // 2 letter ISO 639-1 //signal | QString currentLanguage(); // 2 letter ISO 639-1 //signal | |||
QStringList availableLanguages(); // 2 letter ISO 639-1 | QStringList availableLanguages(); // 2 letter ISO 639-1 | |||
QString currentCountryCode(); //2 letter ISO 3166-1 | QString currentCountryCode(); //2 letter ISO 3166-1 | |||
enum Version { | enum Version { | |||
Os = 1, | Os = 1, | |||
QtCore, | QtCore, | |||
Firmware, | Firmware, | |||
QtMobility | QtMobility | |||
}; | }; | |||
QString version(QSystemInfo::Version type, const QString ¶meter = Q String()); | QString version(QSystemInfo::Version type, const QString ¶meter = Q String()); | |||
enum Feature { | enum Feature { | |||
skipping to change at line 85 | skipping to change at line 82 | |||
enum Version { | enum Version { | |||
Os = 1, | Os = 1, | |||
QtCore, | QtCore, | |||
Firmware, | Firmware, | |||
QtMobility | QtMobility | |||
}; | }; | |||
QString version(QSystemInfo::Version type, const QString ¶meter = Q String()); | QString version(QSystemInfo::Version type, const QString ¶meter = Q String()); | |||
enum Feature { | enum Feature { | |||
BluetoothFeature=0, | BluetoothFeature = 0, | |||
CameraFeature, | CameraFeature, | |||
FmradioFeature, | FmradioFeature, | |||
IrFeature, | IrFeature, | |||
LedFeature, | LedFeature, | |||
MemcardFeature, | MemcardFeature, | |||
UsbFeature, | UsbFeature, | |||
VibFeature, | VibFeature, | |||
WlanFeature, | WlanFeature, | |||
SimFeature, | SimFeature, | |||
LocationFeature, | LocationFeature, | |||
VideoOutFeature, | VideoOutFeature, | |||
HapticsFeature | HapticsFeature, | |||
}; | FmTransmitterFeature | |||
}; | ||||
bool hasFeatureSupported(QSystemInfo::Feature feature); | Q_INVOKABLE bool hasFeatureSupported(QSystemInfo::Feature feature); | |||
Q_SIGNALS: | Q_SIGNALS: | |||
void currentLanguageChanged(const QString &); | void currentLanguageChanged(const QString &lang); | |||
private: | private: | |||
QSystemInfoPrivate *d; | QSystemInfoPrivate *d; | |||
protected: | protected: | |||
void connectNotify(const char *signal); | void connectNotify(const char *signal); | |||
void disconnectNotify(const char *signal); | void disconnectNotify(const char *signal); | |||
}; | }; | |||
QTM_END_NAMESPACE | QTM_END_NAMESPACE | |||
QT_END_HEADER | QT_END_HEADER | |||
#endif /*QSYSTEMSGENERALINFO_H*/ | #endif // QSYSTEMGENERALINFO_H | |||
// End of file | ||||
End of changes. 16 change blocks. | ||||
27 lines changed or deleted | 26 lines changed or added | |||
qsysteminfo.h | qsysteminfo.h | |||
---|---|---|---|---|
skipping to change at line 49 | skipping to change at line 49 | |||
*********************************************************************** *****/ | *********************************************************************** *****/ | |||
#ifndef QSYSTEMINFO_H | #ifndef QSYSTEMINFO_H | |||
#define QSYSTEMINFO_H | #define QSYSTEMINFO_H | |||
#include "qsystemgeneralinfo.h" | #include "qsystemgeneralinfo.h" | |||
#include "qsystemdeviceinfo.h" | #include "qsystemdeviceinfo.h" | |||
#include "qsystemdisplayinfo.h" | #include "qsystemdisplayinfo.h" | |||
#include "qsystemnetworkinfo.h" | #include "qsystemnetworkinfo.h" | |||
#include "qsystemscreensaver.h" | #include "qsystemscreensaver.h" | |||
#include "qsystemstorageinfo.h" | #include "qsystemstorageinfo.h" | |||
#include "qsystembatteryinfo.h" | ||||
#include "qsystemalignedtimer.h" | ||||
#endif | #endif | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 2 lines changed or added | |||
qsystemnetworkinfo.h | qsystemnetworkinfo.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QSYSTEMNETWORKINFO_H | #ifndef QSYSTEMNETWORKINFO_H | |||
#define QSYSTEMNETWORKINFO_H | #define QSYSTEMNETWORKINFO_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include <QObject> | #include <QtCore/qobject.h> | |||
#include <QNetworkInterface> | #include <QtNetwork/qnetworkinterface.h> | |||
QT_BEGIN_HEADER | QT_BEGIN_HEADER | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
class QSystemNetworkInfoPrivate; | class QSystemNetworkInfoPrivate; | |||
class Q_SYSINFO_EXPORT QSystemNetworkInfo : public QObject | class Q_SYSINFO_EXPORT QSystemNetworkInfo : public QObject | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
Q_ENUMS(NetworkStatus) | Q_ENUMS(NetworkStatus) | |||
Q_ENUMS(NetworkMode) | Q_ENUMS(NetworkMode) | |||
Q_PROPERTY(int cellId READ cellId) | Q_ENUMS(CellDataTechnology) | |||
Q_PROPERTY(int cellId READ cellId NOTIFY cellIdChanged) | ||||
Q_PROPERTY(int locationAreaCode READ locationAreaCode) | Q_PROPERTY(int locationAreaCode READ locationAreaCode) | |||
Q_PROPERTY(QString currentMobileCountryCode READ currentMobileCountryCo de NOTIFY currentMobileCountryCodeChanged) | Q_PROPERTY(QString currentMobileCountryCode READ currentMobileCountryCo de NOTIFY currentMobileCountryCodeChanged) | |||
Q_PROPERTY(QString currentMobileNetworkCode READ currentMobileNetworkCo de NOTIFY currentMobileNetworkCodeChanged) | Q_PROPERTY(QString currentMobileNetworkCode READ currentMobileNetworkCo de NOTIFY currentMobileNetworkCodeChanged) | |||
Q_PROPERTY(QString homeMobileCountryCode READ homeMobileCountryCode CON STANT) | Q_PROPERTY(QString homeMobileCountryCode READ homeMobileCountryCode CON STANT) | |||
Q_PROPERTY(QString homeMobileNetworkCode READ homeMobileNetworkCode CON STANT) | Q_PROPERTY(QString homeMobileNetworkCode READ homeMobileNetworkCode CON STANT) | |||
Q_PROPERTY(QSystemNetworkInfo::NetworkMode currentMode READ currentMode CONSTANT) | Q_PROPERTY(QSystemNetworkInfo::NetworkMode currentMode READ currentMode CONSTANT) | |||
Q_PROPERTY(QSystemNetworkInfo::CellDataTechnology cellDataTechnology RE AD cellDataTechnology NOTIFY cellDataTechnologyChanged) | ||||
public: | public: | |||
explicit QSystemNetworkInfo(QObject *parent = 0); | explicit QSystemNetworkInfo(QObject *parent = 0); | |||
~QSystemNetworkInfo(); | ~QSystemNetworkInfo(); | |||
enum NetworkStatus { | enum NetworkStatus { | |||
UndefinedStatus = 0, | UndefinedStatus = 0, | |||
NoNetworkAvailable, | NoNetworkAvailable, | |||
EmergencyOnly, | EmergencyOnly, | |||
Searching, | Searching, | |||
Busy, | Busy, | |||
Connected, | Connected, | |||
skipping to change at line 86 | skipping to change at line 89 | |||
EmergencyOnly, | EmergencyOnly, | |||
Searching, | Searching, | |||
Busy, | Busy, | |||
Connected, | Connected, | |||
HomeNetwork, | HomeNetwork, | |||
Denied, | Denied, | |||
Roaming | Roaming | |||
}; | }; | |||
enum NetworkMode { | enum NetworkMode { | |||
UnknownMode=0, | UnknownMode = 0, | |||
GsmMode, | GsmMode, | |||
CdmaMode, | CdmaMode, | |||
WcdmaMode, | WcdmaMode, //umts | |||
WlanMode, | WlanMode, | |||
EthernetMode, | EthernetMode, | |||
BluetoothMode, | BluetoothMode, | |||
WimaxMode | WimaxMode, | |||
LteMode //1.2 | ||||
}; | }; | |||
enum CellDataTechnology { | ||||
UnknownDataTechnology = 0, | ||||
GprsDataTechnology, | ||||
EdgeDataTechnology, | ||||
UmtsDataTechnology, | ||||
HspaDataTechnology, | ||||
}; //1.2 | ||||
Q_INVOKABLE QSystemNetworkInfo::NetworkStatus networkStatus(QSystemNetw orkInfo::NetworkMode mode); | Q_INVOKABLE QSystemNetworkInfo::NetworkStatus networkStatus(QSystemNetw orkInfo::NetworkMode mode); | |||
Q_INVOKABLE static int networkSignalStrength(QSystemNetworkInfo::Networ kMode mode); | Q_INVOKABLE static int networkSignalStrength(QSystemNetworkInfo::Networ kMode mode); | |||
Q_INVOKABLE QString macAddress(QSystemNetworkInfo::NetworkMode mode); | Q_INVOKABLE QString macAddress(QSystemNetworkInfo::NetworkMode mode); | |||
Q_INVOKABLE QSystemNetworkInfo::NetworkMode currentMode(); | Q_INVOKABLE QSystemNetworkInfo::NetworkMode currentMode(); | |||
int cellId(); | int cellId(); | |||
int locationAreaCode(); | int locationAreaCode(); | |||
QString currentMobileCountryCode(); | QString currentMobileCountryCode(); | |||
QString currentMobileNetworkCode(); | QString currentMobileNetworkCode(); | |||
QString homeMobileCountryCode(); | QString homeMobileCountryCode(); | |||
QString homeMobileNetworkCode(); | QString homeMobileNetworkCode(); | |||
Q_INVOKABLE static QString networkName(QSystemNetworkInfo::NetworkMode mode); | Q_INVOKABLE static QString networkName(QSystemNetworkInfo::NetworkMode mode); | |||
QNetworkInterface interfaceForMode(QSystemNetworkInfo::NetworkMode mode | Q_INVOKABLE QNetworkInterface interfaceForMode(QSystemNetworkInfo::Netw | |||
); | orkMode mode); | |||
QSystemNetworkInfo::CellDataTechnology cellDataTechnology(); | ||||
Q_SIGNALS: | Q_SIGNALS: | |||
void networkStatusChanged(QSystemNetworkInfo::NetworkMode, QSystemNetwor | void networkStatusChanged(QSystemNetworkInfo::NetworkMode mode, QSystem | |||
kInfo::NetworkStatus); | NetworkInfo::NetworkStatus status); | |||
void networkSignalStrengthChanged(QSystemNetworkInfo::NetworkMode, int); | void networkSignalStrengthChanged(QSystemNetworkInfo::NetworkMode mode, | |||
void currentMobileCountryCodeChanged(const QString &); | int strength); | |||
void currentMobileNetworkCodeChanged(const QString &); | void currentMobileCountryCodeChanged(const QString &mcc); | |||
void networkNameChanged(QSystemNetworkInfo::NetworkMode,const QString &) | void currentMobileNetworkCodeChanged(const QString &mnc); | |||
; | void networkNameChanged(QSystemNetworkInfo::NetworkMode mode, const QSt | |||
void networkModeChanged(QSystemNetworkInfo::NetworkMode); | ring &name); | |||
void networkModeChanged(QSystemNetworkInfo::NetworkMode mode); | ||||
void cellIdChanged(int cellId); //1.2 | ||||
void cellDataTechnologyChanged(QSystemNetworkInfo::CellDataTechnology c | ||||
ellTech); //1.2 | ||||
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: | |||
QSystemNetworkInfoPrivate *d; | QSystemNetworkInfoPrivate *d; | |||
}; | }; | |||
QTM_END_NAMESPACE | QTM_END_NAMESPACE | |||
QT_END_HEADER | QT_END_HEADER | |||
#endif // QSYSTEMNETWORKINFO_H | #endif // QSYSTEMNETWORKINFO_H | |||
End of changes. 17 change blocks. | ||||
35 lines changed or deleted | 50 lines changed or added | |||
qsystemscreensaver.h | qsystemscreensaver.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QSYSTEMSCREENSAVER_H | #ifndef QSYSTEMSCREENSAVER_H | |||
#define QSYSTEMSCREENSAVER_H | #define QSYSTEMSCREENSAVER_H | |||
#include <QObject> | #include <QObject> | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
QT_BEGIN_HEADER | QT_BEGIN_HEADER | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
class QSystemScreenSaverPrivate; | class QSystemScreenSaverPrivate; | |||
class Q_SYSINFO_EXPORT QSystemScreenSaver : public QObject | class Q_SYSINFO_EXPORT QSystemScreenSaver : public QObject | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
Q_ENUMS(ScreenSaverState) | Q_ENUMS(ScreenSaverState) | |||
Q_PROPERTY(bool screenSaverInhibited READ screenSaverInhibited) | Q_PROPERTY(bool screenSaverInhibited READ screenSaverInhibited WRITE se tScreenSaverInhibited) | |||
public: | public: | |||
explicit QSystemScreenSaver(QObject *parent = 0); | explicit QSystemScreenSaver(QObject *parent = 0); | |||
~QSystemScreenSaver(); | ~QSystemScreenSaver(); | |||
bool screenSaverInhibited(); | bool screenSaverInhibited(); | |||
Q_INVOKABLE bool setScreenSaverInhibit(); | Q_INVOKABLE bool setScreenSaverInhibit(); | |||
void setScreenSaverInhibited(bool on); | ||||
private: | private: | |||
bool screenSaverIsInhibited; | bool screenSaverIsInhibited; // not used, should be removed | |||
QSystemScreenSaverPrivate *d; | QSystemScreenSaverPrivate *d; | |||
}; | }; | |||
QTM_END_NAMESPACE | QTM_END_NAMESPACE | |||
QT_END_HEADER | QT_END_HEADER | |||
#endif // QSYSTEMSCREENSAVER_H | #endif // QSYSTEMSCREENSAVER_H | |||
End of changes. 10 change blocks. | ||||
19 lines changed or deleted | 20 lines changed or added | |||
qsystemstorageinfo.h | qsystemstorageinfo.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QSYSTEMSTORAGEINFO_H | #ifndef QSYSTEMSTORAGEINFO_H | |||
#define QSYSTEMSTORAGEINFO_H | #define QSYSTEMSTORAGEINFO_H | |||
#include <QObject> | #include <QObject> | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
QT_BEGIN_HEADER | QT_BEGIN_HEADER | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
class QSystemStorageInfoPrivate; | class QSystemStorageInfoPrivate; | |||
class Q_SYSINFO_EXPORT QSystemStorageInfo : public QObject | class Q_SYSINFO_EXPORT QSystemStorageInfo : public QObject | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
Q_PROPERTY(QStringList logicalDrives READ logicalDrives NOTIFY logicalD riveChanged) | Q_PROPERTY(QStringList logicalDrives READ logicalDrives NOTIFY logicalD riveChanged) | |||
Q_ENUMS(DriveType) | Q_ENUMS(DriveType) | |||
Q_ENUMS(StorageState) | ||||
public: | public: | |||
explicit QSystemStorageInfo(QObject *parent = 0); | explicit QSystemStorageInfo(QObject *parent = 0); | |||
~QSystemStorageInfo(); | ~QSystemStorageInfo(); | |||
enum DriveType { | enum DriveType { | |||
NoDrive = 0, | NoDrive = 0, | |||
InternalDrive, | InternalDrive, | |||
RemovableDrive, | RemovableDrive, | |||
RemoteDrive, | RemoteDrive, | |||
CdromDrive | CdromDrive, | |||
InternalFlashDrive, //1.2 | ||||
RamDrive //1.2 | ||||
}; | }; | |||
enum StorageState { | ||||
UnknownStorageState = 0, | ||||
NormalStorageState, | ||||
LowStorageState, //40% | ||||
VeryLowStorageState, //10% | ||||
CriticalStorageState, //2% | ||||
}; //1.2 | ||||
Q_INVOKABLE qlonglong totalDiskSpace(const QString &driveVolume); | Q_INVOKABLE qlonglong totalDiskSpace(const QString &driveVolume); | |||
Q_INVOKABLE qlonglong availableDiskSpace(const QString &driveVolume); | Q_INVOKABLE qlonglong availableDiskSpace(const QString &driveVolume); | |||
static QStringList logicalDrives(); | static QStringList logicalDrives(); | |||
Q_INVOKABLE QSystemStorageInfo::DriveType typeForDrive(const QString &d riveVolume); | Q_INVOKABLE QSystemStorageInfo::DriveType typeForDrive(const QString &d riveVolume); | |||
Q_INVOKABLE QString uriForDrive(const QString &driveVolume); //1.2 | ||||
Q_INVOKABLE QSystemStorageInfo::StorageState getStorageState(const QStr | ||||
ing &volume); //1.2 | ||||
Q_SIGNALS: | Q_SIGNALS: | |||
void logicalDriveChanged(bool added,const QString &vol); | void logicalDriveChanged(bool added,const QString &vol); | |||
void storageStateChanged(const QString &vol, QSystemStorageInfo::Storag eState state); //1.2 | ||||
private: | private: | |||
QSystemStorageInfoPrivate *d; | QSystemStorageInfoPrivate *d; | |||
}; | }; | |||
QTM_END_NAMESPACE | QTM_END_NAMESPACE | |||
QT_END_HEADER | QT_END_HEADER | |||
#endif // QSYSTEMSTORAGEINFO_H | #endif // QSYSTEMSTORAGEINFO_H | |||
End of changes. 12 change blocks. | ||||
18 lines changed or deleted | 33 lines changed or added | |||
qtapsensor.h | qtapsensor.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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" | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
skipping to change at line 61 | skipping to change at line 61 | |||
class Q_SENSORS_EXPORT QTapReading : public QSensorReading | class Q_SENSORS_EXPORT QTapReading : public QSensorReading | |||
{ | { | |||
Q_OBJECT | Q_OBJECT | |||
Q_ENUMS(TapDirection) | Q_ENUMS(TapDirection) | |||
Q_PROPERTY(TapDirection tapDirection READ tapDirection) | Q_PROPERTY(TapDirection tapDirection READ tapDirection) | |||
Q_PROPERTY(bool doubleTap READ isDoubleTap) | Q_PROPERTY(bool doubleTap READ isDoubleTap) | |||
DECLARE_READING(QTapReading) | DECLARE_READING(QTapReading) | |||
public: | public: | |||
enum TapDirection { | enum TapDirection { | |||
Undefined = 0, | Undefined = 0, | |||
X = 0x0001, | X = 0x0001, | |||
Y = 0x0002, | Y = 0x0002, | |||
Z = 0x0004, | Z = 0x0004, | |||
X_Pos = 0x0011, | X_Pos = 0x0011, | |||
Y_Pos = 0x0022, | Y_Pos = 0x0022, | |||
Z_Pos = 0x0044, | Z_Pos = 0x0044, | |||
X_Neg = 0x0101, | X_Neg = 0x0101, | |||
Y_Neg = 0x0202, | Y_Neg = 0x0202, | |||
Z_Neg = 0x0404 | Z_Neg = 0x0404, | |||
X_Both = 0x0111, | ||||
Y_Both = 0x0222, | ||||
Z_Both = 0x0444 | ||||
}; | }; | |||
TapDirection tapDirection() const; | TapDirection tapDirection() const; | |||
void setTapDirection(TapDirection tapDirection); | void setTapDirection(TapDirection tapDirection); | |||
bool isDoubleTap() const; | bool isDoubleTap() const; | |||
void setDoubleTap(bool doubleTap); | void setDoubleTap(bool doubleTap); | |||
}; | }; | |||
class Q_SENSORS_EXPORT QTapFilter : public QSensorFilter | class Q_SENSORS_EXPORT QTapFilter : public QSensorFilter | |||
End of changes. 4 change blocks. | ||||
23 lines changed or deleted | 26 lines changed or added | |||
qtcontacts.h | qtcontacts.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QTCONTACTS_H | #ifndef QTCONTACTS_H | |||
#define QTCONTACTS_H | #define QTCONTACTS_H | |||
// this file includes all of the public header files | // this file includes all of the public header files | |||
// provided by the Qt Contacts API | // provided by the Qt Contacts API | |||
#include "qtcontactsglobal.h" // global exports | #include "qtcontactsglobal.h" // global exports | |||
#include "qcontactmanager.h" // manager | #include "qcontactmanager.h" // manager | |||
#include "qcontactmanagerengine.h" // manager backend | #include "qcontactmanagerengine.h" // manager backend | |||
#include "qcontactmanagerenginefactory.h" // manage backend instantia tor | #include "qcontactmanagerenginefactory.h" // manage backend instantia tor | |||
#include "qcontact.h" // contact | #include "qcontact.h" // contact | |||
#include "qcontactid.h" // contact identifier | #include "qcontactid.h" // contact identifier | |||
#include "qcontactobserver.h" // contact observer | ||||
#include "qcontactdetaildefinition.h" // detail definition | #include "qcontactdetaildefinition.h" // detail definition | |||
#include "qcontactdetailfielddefinition.h" // field in a detail defini tion | #include "qcontactdetailfielddefinition.h" // field in a detail defini tion | |||
#include "qcontactdetail.h" // contact detail | #include "qcontactdetail.h" // contact detail | |||
#include "qcontactdetails.h" // leaf detail classes | #include "qcontactdetails.h" // leaf detail classes | |||
#include "qcontactfetchhint.h" // backend optimization hin t class | #include "qcontactfetchhint.h" // backend optimization hin t class | |||
#include "qcontactfilter.h" // contact filter | #include "qcontactfilter.h" // contact filter | |||
#include "qcontactfilters.h" // leaf filter classes | #include "qcontactfilters.h" // leaf filter classes | |||
#include "qcontactsortorder.h" // contact sorting | #include "qcontactsortorder.h" // contact sorting | |||
#include "qcontactaction.h" // actions | #include "qcontactaction.h" // actions | |||
#include "qcontactactiondescriptor.h" // action descriptors | #include "qcontactactiondescriptor.h" // action descriptors | |||
End of changes. 4 change blocks. | ||||
14 lines changed or deleted | 15 lines changed or added | |||
qtcontactsglobal.h | qtcontactsglobal.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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 <qlatin1constant.h> | #include <qlatin1constant.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qtmedianamespace.h | qtmedianamespace.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qtorganizer.h | qtorganizer.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QTORGANIZER_H | #ifndef QTORGANIZER_H | |||
#define QTORGANIZER_H | #define QTORGANIZER_H | |||
// this file includes all of the public header files | // this file includes all of the public header files | |||
// provided by the Qt Organizer API | // provided by the Qt Organizer API | |||
#include "qtorganizerglobal.h" // global exports | #include "qtorganizerglobal.h" // global exports | |||
#include "qorganizerabstractrequest.h" // asynchronous reque st | #include "qorganizerabstractrequest.h" // asynchronous reque st | |||
#include "qorganizeritemdetail.h" // organizer item det ail | #include "qorganizeritemdetail.h" // organizer item det ail | |||
#include "qorganizeritemdetaildefinition.h" // detail definition | #include "qorganizeritemdetaildefinition.h" // detail definition | |||
#include "qorganizeritemdetailfielddefinition.h" // field in a detail definition | #include "qorganizeritemdetailfielddefinition.h" // field in a detail definition | |||
#include "qorganizeritemfetchhint.h" // fetch hint class | #include "qorganizeritemfetchhint.h" // fetch hint class | |||
#include "qorganizeritemfilter.h" // organizer item fil ter | #include "qorganizeritemfilter.h" // organizer item fil ter | |||
#include "qorganizeritem.h" // organizer item | #include "qorganizeritem.h" // organizer item | |||
#include "qorganizeritemid.h" // organizer item ide ntifier | #include "qorganizeritemid.h" // organizer item ide ntifier | |||
#include "qorganizeritemobserver.h" // organizer item obs erver | ||||
#include "qorganizermanager.h" // manager | #include "qorganizermanager.h" // manager | |||
#include "qorganizermanagerengine.h" // manager backend | #include "qorganizermanagerengine.h" // manager backend | |||
#include "qorganizermanagerenginefactory.h" // manage backend ins tantiator | #include "qorganizermanagerenginefactory.h" // manage backend ins tantiator | |||
#include "qorganizerrecurrencerule.h" // a single recurrenc e rule | #include "qorganizerrecurrencerule.h" // a single recurrenc e rule | |||
#include "qorganizeritemsortorder.h" // organizer item sor ting | #include "qorganizeritemsortorder.h" // organizer item sor ting | |||
#include "qorganizercollection.h" // collection of item s | #include "qorganizercollection.h" // collection of item s | |||
#include "qorganizercollectionid.h" // collection identif ier | #include "qorganizercollectionid.h" // collection identif ier | |||
#include "qorganizercollectionchangeset.h" // engine-specific co llection changeset | #include "qorganizercollectionchangeset.h" // engine-specific co llection changeset | |||
End of changes. 4 change blocks. | ||||
14 lines changed or deleted | 15 lines changed or added | |||
qtorganizerglobal.h | qtorganizerglobal.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:LGPL$ | |||
** Commercial Usage | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QTORGANIZERGLOBAL_H | #ifndef QTORGANIZERGLOBAL_H | |||
#define QTORGANIZERGLOBAL_H | #define QTORGANIZERGLOBAL_H | |||
#include <qmobilityglobal.h> | #include <qmobilityglobal.h> | |||
#include <qlatin1constant.h> | #include <qlatin1constant.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qvaluespace.h | qvaluespace.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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> | |||
skipping to change at line 83 | skipping to change at line 83 | |||
} | } | |||
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) | |||
#define QVALUESPACE_VOLATILEREGISTRY_LAYER QUuid(0x8ceb5811, 0x4968, 0x470f , 0x8f, 0xc2, \ | #define QVALUESPACE_VOLATILEREGISTRY_LAYER QUuid(0x8ceb5811, 0x4968, 0x470f , 0x8f, 0xc2, \ | |||
0x26, 0x47, 0x67, 0xe0, 0x bb, 0xd9) | 0x26, 0x47, 0x67, 0xe0, 0x bb, 0xd9) | |||
#define QVALUESPACE_NONVOLATILEREGISTRY_LAYER QUuid(0x8e29561c, 0xa0f0, 0x4 e89, 0xba, 0x56, \ | #define QVALUESPACE_NONVOLATILEREGISTRY_LAYER QUuid(0x8e29561c, 0xa0f0, 0x4 e89, 0xba, 0x56, \ | |||
0x08, 0x06, 0x64, 0xab, 0xc0, 0x17) | 0x08, 0x06, 0x64, 0xab, 0xc0, 0x17) | |||
#define QVALUESPACE_CONTEXTKIT_LAYER QUuid(0x2c769b9e, 0xd949, 0x4cd1, 0x84 , 0x8f, \ | #define QVALUESPACE_CONTEXTKITNONCORE_LAYER QUuid(0x2c769b9e, 0xd949, 0x4cd 1, 0x84, 0x8f, \ | |||
0xd3, 0x22, 0x41, 0xfe, 0x07, 0x ff) | 0xd3, 0x22, 0x41, 0xfe, 0x07, 0x ff) | |||
#define QVALUESPACE_CONTEXTKITCORE_LAYER QUuid(0x6f111da0, 0x185d, 0x45a1, | ||||
0x94, 0x85, \ | ||||
0xc5, 0xd1, 0x4c, 0xd5, | ||||
0x11, 0xce) | ||||
#define QVALUESPACE_SYMBIAN_SETTINGS_LAYER QUuid(0x40d7b059, 0x66ac, 0x442f , 0xb2, 0x22, \ | #define QVALUESPACE_SYMBIAN_SETTINGS_LAYER QUuid(0x40d7b059, 0x66ac, 0x442f , 0xb2, 0x22, \ | |||
0x9c, 0x8a, 0xb9, 0x8b, 0x 9c, 0x2d) | 0x9c, 0x8a, 0xb9, 0x8b, 0x 9c, 0x2d) | |||
#define QVALUESPACE_GCONF_LAYER QUuid(0x0e2e5da0, 0x0044, 0x11df, 0x94, 0x1 c, \ | #define QVALUESPACE_GCONF_LAYER QUuid(0x0e2e5da0, 0x0044, 0x11df, 0x94, 0x1 c, \ | |||
0x00, 0x02, 0xa5, 0xd5, 0x c5, 0x1b) | 0x00, 0x02, 0xa5, 0xd5, 0x c5, 0x1b) | |||
QTM_END_NAMESPACE | QTM_END_NAMESPACE | |||
QT_END_HEADER | QT_END_HEADER | |||
#endif // _QVALUESPACE_H_ | #endif // _QVALUESPACE_H_ | |||
End of changes. 5 change blocks. | ||||
15 lines changed or deleted | 19 lines changed or added | |||
qvaluespacepublisher.h | qvaluespacepublisher.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QVALUESPACEPUBLISHER_H | #ifndef QVALUESPACEPUBLISHER_H | |||
#define QVALUESPACEPUBLISHER_H | #define QVALUESPACEPUBLISHER_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include "qvaluespace.h" | #include "qvaluespace.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qvaluespacesubscriber.h | qvaluespacesubscriber.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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" | |||
#include "qvaluespace.h" | #include "qvaluespace.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qversitcontactexporter.h | qversitcontactexporter.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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" | |||
#include "qversitresourcehandler.h" | #include "qversitresourcehandler.h" | |||
#include "qversitdocument.h" | #include "qversitdocument.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qversitcontacthandler.h | qversitcontacthandler.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QVERSITCONTACTHANDLER_H | #ifndef QVERSITCONTACTHANDLER_H | |||
#define QVERSITCONTACTHANDLER_H | #define QVERSITCONTACTHANDLER_H | |||
#include "qversitcontactimporter.h" | #include "qversitcontactimporter.h" | |||
#include "qversitcontactexporter.h" | #include "qversitcontactexporter.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qversitcontactimporter.h | qversitcontactimporter.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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" | |||
#include "qversitresourcehandler.h" | #include "qversitresourcehandler.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qversitdocument.h | qversitdocument.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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" | |||
#include <QList> | #include <QList> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qversitorganizerexporter.h | qversitorganizerexporter.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QVERSITORGANIZEREXPORTER_H | #ifndef QVERSITORGANIZEREXPORTER_H | |||
#define QVERSITORGANIZEREXPORTER_H | #define QVERSITORGANIZEREXPORTER_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include "qversitdocument.h" | #include "qversitdocument.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qversitorganizerhandler.h | qversitorganizerhandler.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QVERSITORGANIZERHANDLER_H | #ifndef QVERSITORGANIZERHANDLER_H | |||
#define QVERSITORGANIZERHANDLER_H | #define QVERSITORGANIZERHANDLER_H | |||
#include "qversitorganizerimporter.h" | #include "qversitorganizerimporter.h" | |||
#include "qversitorganizerexporter.h" | #include "qversitorganizerexporter.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qversitorganizerimporter.h | qversitorganizerimporter.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QVERSITORGANIZERIMPORTER_H | #ifndef QVERSITORGANIZERIMPORTER_H | |||
#define QVERSITORGANIZERIMPORTER_H | #define QVERSITORGANIZERIMPORTER_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include <qorganizeritem.h> | #include <qorganizeritem.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qversitproperty.h | qversitproperty.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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" | |||
#include "qversitdocument.h" | #include "qversitdocument.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qversitreader.h | qversitreader.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QVERSITREADER_H | #ifndef QVERSITREADER_H | |||
#define QVERSITREADER_H | #define QVERSITREADER_H | |||
#include "qversitdocument.h" | #include "qversitdocument.h" | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qversitresourcehandler.h | qversitresourcehandler.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QVERSITRESOURCEHANDLER_H | #ifndef QVERSITRESOURCEHANDLER_H | |||
#define QVERSITRESOURCEHANDLER_H | #define QVERSITRESOURCEHANDLER_H | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
#include <QString> | #include <QString> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qversittimezonehandler.h | qversittimezonehandler.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QVERSITTIMEZONEHANDLER_H | #ifndef QVERSITTIMEZONEHANDLER_H | |||
#define QVERSITTIMEZONEHANDLER_H | #define QVERSITTIMEZONEHANDLER_H | |||
#include <QDateTime> | #include <QDateTime> | |||
QTM_BEGIN_NAMESPACE | QTM_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qversitwriter.h | qversitwriter.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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" | |||
#include "qmobilityglobal.h" | #include "qmobilityglobal.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qvideodevicecontrol.h | qvideodevicecontrol.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QVIDEODEVICECONTROL_H | #ifndef QVIDEODEVICECONTROL_H | |||
#define QVIDEODEVICECONTROL_H | #define QVIDEODEVICECONTROL_H | |||
#include "qmediacontrol.h" | #include "qmediacontrol.h" | |||
QT_BEGIN_NAMESPACE | QT_BEGIN_NAMESPACE | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qvideoencodercontrol.h | qvideoencodercontrol.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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" | |||
#include "qmediarecorder.h" | #include "qmediarecorder.h" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qvideoframe.h | qvideoframe.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QVIDEOFRAME_H | #ifndef QVIDEOFRAME_H | |||
#define QVIDEOFRAME_H | #define QVIDEOFRAME_H | |||
#include <QtCore/qmetatype.h> | #include <QtCore/qmetatype.h> | |||
#include <QtCore/qshareddata.h> | #include <QtCore/qshareddata.h> | |||
#include <QtGui/qimage.h> | #include <QtGui/qimage.h> | |||
skipping to change at line 104 | skipping to change at line 104 | |||
Format_YUYV, | Format_YUYV, | |||
Format_NV12, | Format_NV12, | |||
Format_NV21, | Format_NV21, | |||
Format_IMC1, | Format_IMC1, | |||
Format_IMC2, | Format_IMC2, | |||
Format_IMC3, | Format_IMC3, | |||
Format_IMC4, | Format_IMC4, | |||
Format_Y8, | Format_Y8, | |||
Format_Y16, | Format_Y16, | |||
Format_Jpeg, | ||||
Format_CameraRaw, | ||||
Format_AdobeDng, | ||||
Format_User = 1000 | Format_User = 1000 | |||
}; | }; | |||
QVideoFrame(); | QVideoFrame(); | |||
QVideoFrame(QAbstractVideoBuffer *buffer, const QSize &size, PixelForma t format); | QVideoFrame(QAbstractVideoBuffer *buffer, const QSize &size, PixelForma t format); | |||
QVideoFrame(int bytes, const QSize &size, int bytesPerLine, PixelFormat format); | QVideoFrame(int bytes, const QSize &size, int bytesPerLine, PixelFormat format); | |||
QVideoFrame(const QImage &image); | QVideoFrame(const QImage &image); | |||
QVideoFrame(const QVideoFrame &other); | QVideoFrame(const QVideoFrame &other); | |||
~QVideoFrame(); | ~QVideoFrame(); | |||
End of changes. 4 change blocks. | ||||
14 lines changed or deleted | 19 lines changed or added | |||
qvideorenderercontrol.h | qvideorenderercontrol.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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 | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qvideosurfaceformat.h | qvideosurfaceformat.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** contact the sales department at qt-sales@nokia.com. | ||||
** $QT_END_LICENSE$ | ** $QT_END_LICENSE$ | |||
** | ** | |||
*************************************************************************** */ | *************************************************************************** */ | |||
#ifndef QVIDEOSURFACEFORMAT_H | #ifndef QVIDEOSURFACEFORMAT_H | |||
#define QVIDEOSURFACEFORMAT_H | #define QVIDEOSURFACEFORMAT_H | |||
#include <QtCore/qlist.h> | #include <QtCore/qlist.h> | |||
#include <QtCore/qpair.h> | #include <QtCore/qpair.h> | |||
#include <QtCore/qshareddata.h> | #include <QtCore/qshareddata.h> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qvideowidget.h | qvideowidget.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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> | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qvideowidgetcontrol.h | qvideowidgetcontrol.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||
qvideowindowcontrol.h | qvideowindowcontrol.h | |||
---|---|---|---|---|
/************************************************************************** ** | /************************************************************************** ** | |||
** | ** | |||
** 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 | ** No Commercial Usage | |||
** Licensees holding valid Qt Commercial licenses may use this file in | ** This file contains pre-release code and may not be distributed. | |||
** accordance with the Qt Commercial License Agreement provided with | ** You may use this file in accordance with the terms and conditions | |||
** the Software or, alternatively, in accordance with the terms | ** contained in the Technology Preview License Agreement accompanying | |||
** contained in a written agreement between you and Nokia. | ** this package. | |||
** | ** | |||
** 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. | |||
** | ** | |||
** In addition, as a special exception, Nokia gives you certain additional | ** In addition, as a special exception, Nokia gives you certain additional | |||
** rights. These rights are described in the Nokia Qt LGPL Exception | ** rights. These rights are described in the Nokia Qt LGPL Exception | |||
** 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 | ** If you have questions regarding the use of this file, please contact | |||
** Alternatively, this file may be used under the terms of the GNU | ** Nokia at qt-info@nokia.com. | |||
** General Public License version 3.0 as published by the Free Software | ** | |||
** Foundation and appearing in the file LICENSE.GPL included in the | ** | |||
** packaging of this file. Please review the following information to | ** | |||
** ensure the GNU General Public License version 3.0 requirements will be | ** | |||
** met: http://www.gnu.org/copyleft/gpl.html. | ** | |||
** | ||||
** | ||||
** | ** | |||
** If you are unsure which license is appropriate for your use, please | ||||
** 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" | |||
End of changes. 3 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added | |||