Move QDeclarativePropertyValueInterceptor into a private header

This should never have been public.

Change-Id: I77811413c93fdc7767d0921e12284e9a8bc88752
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>

diff --git a/src/declarative/qml/qdeclarative.h b/src/declarative/qml/qdeclarative.h
index b98899b..4babb76 100644 (file)
--- a/src/declarative/qml/qdeclarative.h
+++ b/src/declarative/qml/qdeclarative.h
@@ -45,7 +45,6 @@
 #include <QtDeclarative/qdeclarativeprivate.h>
 #include <QtDeclarative/qdeclarativeparserstatus.h>
 #include <QtDeclarative/qdeclarativepropertyvaluesource.h>
-#include <QtDeclarative/qdeclarativepropertyvalueinterceptor.h>
 #include <QtDeclarative/qdeclarativelist.h>
 
 #include <QtCore/qbytearray.h>
@@ -89,6 +88,8 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
+class QDeclarativePropertyValueInterceptor;
+
 template<typename T>
 int qmlRegisterType()
 {

diff --git a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.cpp b/src/declarative/qml/qdeclarativepropertyvalueinterceptor.cpp
index 325be0f..39b1aed 100644 (file)
--- 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_p.h
similarity index 85%
rename from src/declarative/qml/qdeclarativepropertyvalueinterceptor.h
rename to src/declarative/qml/qdeclarativepropertyvalueinterceptor_p.h
index 95d653f..7f99f95 100644 (file)
--- a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h
+++ b/src/declarative/qml/qdeclarativepropertyvalueinterceptor_p.h
@@ -39,17 +39,24 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVEPROPERTYVALUEINTERCEPTOR_H
-#define QDECLARATIVEPROPERTYVALUEINTERCEPTOR_H
+#ifndef QDECLARATIVEPROPERTYVALUEINTERCEPTOR_P_H
+#define QDECLARATIVEPROPERTYVALUEINTERCEPTOR_P_H
 
-#include <QtCore/qobject.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.
+//
 
-QT_BEGIN_HEADER
+#include <QtCore/qobject.h>
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
-
 class QDeclarativeProperty;
 class Q_DECLARATIVE_EXPORT QDeclarativePropertyValueInterceptor
 {
@@ -63,6 +70,4 @@ Q_DECLARE_INTERFACE(QDeclarativePropertyValueInterceptor, "com.trolltech.qml.QDe
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
-#endif // QDECLARATIVEPROPERTYVALUEINTERCEPTOR_H
+#endif // QDECLARATIVEPROPERTYVALUEINTERCEPTOR_P_H

diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp
index a6fc8ba..327a0ae 100644 (file)
--- a/src/declarative/qml/qdeclarativevme.cpp
+++ b/src/declarative/qml/qdeclarativevme.cpp
@@ -64,6 +64,7 @@
 #include <private/qfinitestack_p.h>
 #include "qdeclarativescriptstring.h"
 #include "qdeclarativescriptstring_p.h"
+#include "qdeclarativepropertyvalueinterceptor_p.h"
 
 #include <QStack>
 #include <QColor>

diff --git a/src/declarative/qml/qdeclarativevmemetaobject.cpp b/src/declarative/qml/qdeclarativevmemetaobject.cpp
index f768d8c..229a93b 100644 (file)
--- a/src/declarative/qml/qdeclarativevmemetaobject.cpp
+++ b/src/declarative/qml/qdeclarativevmemetaobject.cpp
@@ -41,12 +41,14 @@
 
 #include "qdeclarativevmemetaobject_p.h"
 
+
 #include "qdeclarative.h"
 #include <private/qdeclarativerefcount_p.h>
 #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 (file)
--- 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 (file)
--- a/src/declarative/util/qdeclarativebehavior_p.h
+++ b/src/declarative/util/qdeclarativebehavior_p.h
@@ -44,7 +44,7 @@
 
 #include <private/qdeclarativeglobal_p.h>
 
-#include <qdeclarativepropertyvalueinterceptor.h>
+#include <private/qdeclarativepropertyvalueinterceptor_p.h>
 #include <qdeclarative.h>
 #include <QtCore/QAbstractAnimation>
 

diff --git a/src/qtquick1/util/qdeclarativebehavior_p.h b/src/qtquick1/util/qdeclarativebehavior_p.h
index cc026ef..f7d34f8 100644 (file)
--- 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 <QtDeclarative/qdeclarativepropertyvaluesource.h>
-#include <QtDeclarative/qdeclarativepropertyvalueinterceptor.h>
+#include <private/qdeclarativepropertyvalueinterceptor_p.h>
 #include <QtDeclarative/qdeclarative.h>
 #include <QtCore/QAbstractAnimation>
 

diff --git a/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp b/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp
index ce8b335..bf83a3d 100644 (file)
--- a/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp
+++ b/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp
@@ -54,6 +54,7 @@
 #include <QWidget>
 
 #include <private/qdeclarativemetatype_p.h>
+#include <private/qdeclarativepropertyvalueinterceptor_p.h>
 
 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 (file)
--- a/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h
+++ b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h
@@ -59,6 +59,7 @@
 #include <QDeclarativePropertyValueSource>
 #include <QDeclarativeProperty>
 #include <private/qdeclarativeproperty_p.h>
+#include <private/qdeclarativepropertyvalueinterceptor_p.h>
 
 class MyTypeObject : public QObject
 {