From 413bbeb9358cc1c908c97158ad82154b7fdf6b20 Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Thu, 1 Dec 2011 11:11:43 +0000 Subject: [PATCH] Move QDeclarativePropertyValueInterceptor into a private header This should never have been public. Change-Id: I77811413c93fdc7767d0921e12284e9a8bc88752 Reviewed-by: Kent Hansen --- src/declarative/qml/qdeclarative.h | 3 +- .../qml/qdeclarativepropertyvalueinterceptor.cpp | 2 +- .../qml/qdeclarativepropertyvalueinterceptor.h | 68 ------------------ .../qml/qdeclarativepropertyvalueinterceptor_p.h | 73 ++++++++++++++++++++ src/declarative/qml/qdeclarativevme.cpp | 1 + src/declarative/qml/qdeclarativevmemetaobject.cpp | 2 + src/declarative/qml/qml.pri | 2 +- src/declarative/util/qdeclarativebehavior_p.h | 2 +- src/qtquick1/util/qdeclarativebehavior_p.h | 2 +- .../tst_qdeclarativemetatype.cpp | 1 + .../declarative/qdeclarativevaluetypes/testtypes.h | 1 + 11 files changed, 84 insertions(+), 73 deletions(-) delete mode 100644 src/declarative/qml/qdeclarativepropertyvalueinterceptor.h create mode 100644 src/declarative/qml/qdeclarativepropertyvalueinterceptor_p.h diff --git a/src/declarative/qml/qdeclarative.h b/src/declarative/qml/qdeclarative.h index b98899b..4babb76 100644 --- a/src/declarative/qml/qdeclarative.h +++ b/src/declarative/qml/qdeclarative.h @@ -45,7 +45,6 @@ #include #include #include -#include #include #include @@ -89,6 +88,8 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) +class QDeclarativePropertyValueInterceptor; + template int qmlRegisterType() { diff --git a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.cpp b/src/declarative/qml/qdeclarativepropertyvalueinterceptor.cpp index 325be0f..39b1aed 100644 --- a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.cpp +++ b/src/declarative/qml/qdeclarativepropertyvalueinterceptor.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qdeclarativepropertyvalueinterceptor.h" +#include "qdeclarativepropertyvalueinterceptor_p.h" #include "qdeclarative.h" diff --git a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h b/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h deleted file mode 100644 index 95d653f..0000000 --- a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QDECLARATIVEPROPERTYVALUEINTERCEPTOR_H -#define QDECLARATIVEPROPERTYVALUEINTERCEPTOR_H - -#include - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(Declarative) - -class QDeclarativeProperty; -class Q_DECLARATIVE_EXPORT QDeclarativePropertyValueInterceptor -{ -public: - QDeclarativePropertyValueInterceptor(); - virtual ~QDeclarativePropertyValueInterceptor(); - virtual void setTarget(const QDeclarativeProperty &property) = 0; - virtual void write(const QVariant &value) = 0; -}; -Q_DECLARE_INTERFACE(QDeclarativePropertyValueInterceptor, "com.trolltech.qml.QDeclarativePropertyValueInterceptor") - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QDECLARATIVEPROPERTYVALUEINTERCEPTOR_H diff --git a/src/declarative/qml/qdeclarativepropertyvalueinterceptor_p.h b/src/declarative/qml/qdeclarativepropertyvalueinterceptor_p.h new file mode 100644 index 0000000..7f99f95 --- /dev/null +++ b/src/declarative/qml/qdeclarativepropertyvalueinterceptor_p.h @@ -0,0 +1,73 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QDECLARATIVEPROPERTYVALUEINTERCEPTOR_P_H +#define QDECLARATIVEPROPERTYVALUEINTERCEPTOR_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include + +QT_BEGIN_NAMESPACE + +class QDeclarativeProperty; +class Q_DECLARATIVE_EXPORT QDeclarativePropertyValueInterceptor +{ +public: + QDeclarativePropertyValueInterceptor(); + virtual ~QDeclarativePropertyValueInterceptor(); + virtual void setTarget(const QDeclarativeProperty &property) = 0; + virtual void write(const QVariant &value) = 0; +}; +Q_DECLARE_INTERFACE(QDeclarativePropertyValueInterceptor, "com.trolltech.qml.QDeclarativePropertyValueInterceptor") + +QT_END_NAMESPACE + +#endif // QDECLARATIVEPROPERTYVALUEINTERCEPTOR_P_H diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp index a6fc8ba..327a0ae 100644 --- a/src/declarative/qml/qdeclarativevme.cpp +++ b/src/declarative/qml/qdeclarativevme.cpp @@ -64,6 +64,7 @@ #include #include "qdeclarativescriptstring.h" #include "qdeclarativescriptstring_p.h" +#include "qdeclarativepropertyvalueinterceptor_p.h" #include #include diff --git a/src/declarative/qml/qdeclarativevmemetaobject.cpp b/src/declarative/qml/qdeclarativevmemetaobject.cpp index f768d8c..229a93b 100644 --- a/src/declarative/qml/qdeclarativevmemetaobject.cpp +++ b/src/declarative/qml/qdeclarativevmemetaobject.cpp @@ -41,12 +41,14 @@ #include "qdeclarativevmemetaobject_p.h" + #include "qdeclarative.h" #include #include "qdeclarativeexpression.h" #include "qdeclarativeexpression_p.h" #include "qdeclarativecontext_p.h" #include "qdeclarativebinding_p.h" +#include "qdeclarativepropertyvalueinterceptor_p.h" Q_DECLARE_METATYPE(QJSValue); diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri index 928854a..8508e24 100644 --- a/src/declarative/qml/qml.pri +++ b/src/declarative/qml/qml.pri @@ -70,7 +70,7 @@ HEADERS += \ $$PWD/qdeclarativecustomparser_p.h \ $$PWD/qdeclarativecustomparser_p_p.h \ $$PWD/qdeclarativepropertyvaluesource.h \ - $$PWD/qdeclarativepropertyvalueinterceptor.h \ + $$PWD/qdeclarativepropertyvalueinterceptor_p.h \ $$PWD/qdeclarativeboundsignal_p.h \ $$PWD/qdeclarativeparserstatus.h \ $$PWD/qdeclarativeproxymetaobject_p.h \ diff --git a/src/declarative/util/qdeclarativebehavior_p.h b/src/declarative/util/qdeclarativebehavior_p.h index 3918d34..613461a 100644 --- a/src/declarative/util/qdeclarativebehavior_p.h +++ b/src/declarative/util/qdeclarativebehavior_p.h @@ -44,7 +44,7 @@ #include -#include +#include #include #include diff --git a/src/qtquick1/util/qdeclarativebehavior_p.h b/src/qtquick1/util/qdeclarativebehavior_p.h index cc026ef..f7d34f8 100644 --- a/src/qtquick1/util/qdeclarativebehavior_p.h +++ b/src/qtquick1/util/qdeclarativebehavior_p.h @@ -45,7 +45,7 @@ #include "QtQuick1/private/qdeclarativestate_p.h" #include -#include +#include #include #include diff --git a/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp b/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp index ce8b335..bf83a3d 100644 --- a/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp +++ b/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp @@ -54,6 +54,7 @@ #include #include +#include class tst_qdeclarativemetatype : public QObject { diff --git a/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h index 5eb6bf6..7166216 100644 --- a/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h +++ b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h @@ -59,6 +59,7 @@ #include #include #include +#include class MyTypeObject : public QObject { -- 1.7.2.5