summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2015-06-08 13:05:42 +0100
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>2015-06-08 16:56:26 +0000
commit3779e007024b712dee5cd8c187950119ba811bcf (patch)
tree9b016a40075e23a2b6a998cbc0e11ef338a6a64d
parent7c07835dbfa127d901cb490165ff92a375c9f09b (diff)
Remove unnecessary metatype declarations
Task-number: QTBUG-46539 Change-Id: I0e9e2d405da2fa5ecc2fc8b8efece6f7364e1b39 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
-rw-r--r--src/core/aspects/qabstractaspect.h2
-rw-r--r--src/core/nodes/qentity.h2
-rw-r--r--src/core/nodes/qnode.h2
-rw-r--r--src/input/q3dkeyevent.h2
-rw-r--r--src/input/qkeyboardcontroller.h2
-rw-r--r--src/quick3d/quick3drenderer/items/quick3dshaderdata.h2
-rw-r--r--src/quick3d/quick3drenderer/items/quick3dshaderdataarray.h2
-rw-r--r--src/render/frontend/framegraph-components/qsortcriterion.h2
-rw-r--r--src/render/frontend/qabstracttextureprovider.h2
-rw-r--r--src/render/frontend/qannotation.h2
-rw-r--r--src/render/frontend/qeffect.h2
-rw-r--r--src/render/frontend/qopenglfilter.h2
-rw-r--r--src/render/frontend/qparameter.h2
-rw-r--r--src/render/frontend/qrenderpass.h2
-rw-r--r--src/render/frontend/qshaderdata.h2
-rw-r--r--src/render/frontend/qshaderprogram.h2
-rw-r--r--src/render/frontend/qtechnique.h2
-rw-r--r--src/render/frontend/qtextureimage.h2
-rw-r--r--src/render/frontend/qwrapmode.h2
19 files changed, 0 insertions, 38 deletions
diff --git a/src/core/aspects/qabstractaspect.h b/src/core/aspects/qabstractaspect.h
index 16d6b1d96..83e1953e2 100644
--- a/src/core/aspects/qabstractaspect.h
+++ b/src/core/aspects/qabstractaspect.h
@@ -118,6 +118,4 @@ void QAbstractAspect::registerBackendType(const QBackendNodeFunctorPtr &functor)
QT_END_NAMESPACE
-Q_DECLARE_METATYPE(Qt3D::QAbstractAspect *)
-
#endif // QT3D_ABSTRACTASPECT_H
diff --git a/src/core/nodes/qentity.h b/src/core/nodes/qentity.h
index 86a6ba791..17a0107ec 100644
--- a/src/core/nodes/qentity.h
+++ b/src/core/nodes/qentity.h
@@ -80,6 +80,4 @@ private:
QT_END_NAMESPACE
-Q_DECLARE_METATYPE(Qt3D::QEntity *)
-
#endif // QT3D_QENTITY_H
diff --git a/src/core/nodes/qnode.h b/src/core/nodes/qnode.h
index e61f30edb..5d9f04283 100644
--- a/src/core/nodes/qnode.h
+++ b/src/core/nodes/qnode.h
@@ -98,6 +98,4 @@ private:
QT_END_NAMESPACE
-Q_DECLARE_METATYPE(Qt3D::QNode *)
-
#endif
diff --git a/src/input/q3dkeyevent.h b/src/input/q3dkeyevent.h
index 21f3e4b3c..9f66d26c5 100644
--- a/src/input/q3dkeyevent.h
+++ b/src/input/q3dkeyevent.h
@@ -84,6 +84,4 @@ private:
QT_END_NAMESPACE
-Q_DECLARE_METATYPE(Qt3D::Q3DKeyEvent*)
-
#endif // QT3D_Q3DKEYEVENT_H
diff --git a/src/input/qkeyboardcontroller.h b/src/input/qkeyboardcontroller.h
index df667b4d5..e30b8722b 100644
--- a/src/input/qkeyboardcontroller.h
+++ b/src/input/qkeyboardcontroller.h
@@ -74,6 +74,4 @@ private:
QT_END_NAMESPACE
-Q_DECLARE_METATYPE(Qt3D::QKeyboardController *)
-
#endif // QT3D_INPUT_QKEYBOARDCONTROLLER_H
diff --git a/src/quick3d/quick3drenderer/items/quick3dshaderdata.h b/src/quick3d/quick3drenderer/items/quick3dshaderdata.h
index 56bd143f9..65b635fe7 100644
--- a/src/quick3d/quick3drenderer/items/quick3dshaderdata.h
+++ b/src/quick3d/quick3drenderer/items/quick3dshaderdata.h
@@ -69,6 +69,4 @@ private:
QT_END_NAMESPACE
-Q_DECLARE_METATYPE(Qt3D::Render::Quick::Quick3DShaderData*)
-
#endif // QT3D_RENDER_QUICK_QUICK3DSHADERDATA_H
diff --git a/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.h b/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.h
index 7e663fbb9..e5ca26bf0 100644
--- a/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.h
+++ b/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.h
@@ -85,6 +85,4 @@ private:
QT_END_NAMESPACE
-Q_DECLARE_METATYPE(Qt3D::Render::Quick::Quick3DShaderDataArray*)
-
#endif // QT3D_RENDER_QUICK_QUICK3DSHADERDATAARRAY_H
diff --git a/src/render/frontend/framegraph-components/qsortcriterion.h b/src/render/frontend/framegraph-components/qsortcriterion.h
index ef413eeb5..2e24c0ee4 100644
--- a/src/render/frontend/framegraph-components/qsortcriterion.h
+++ b/src/render/frontend/framegraph-components/qsortcriterion.h
@@ -79,6 +79,4 @@ private:
QT_END_NAMESPACE
-Q_DECLARE_METATYPE(Qt3D::QSortCriterion *)
-
#endif // QSORTCRITERION_H
diff --git a/src/render/frontend/qabstracttextureprovider.h b/src/render/frontend/qabstracttextureprovider.h
index 025270cd5..dd82bd776 100644
--- a/src/render/frontend/qabstracttextureprovider.h
+++ b/src/render/frontend/qabstracttextureprovider.h
@@ -331,6 +331,4 @@ private:
QT_END_NAMESPACE
-Q_DECLARE_METATYPE(Qt3D::QAbstractTextureProvider*)
-
#endif // QT3D_QABSTRACTTEXTUREPROVIDER_H
diff --git a/src/render/frontend/qannotation.h b/src/render/frontend/qannotation.h
index 639de2e0e..47c82d418 100644
--- a/src/render/frontend/qannotation.h
+++ b/src/render/frontend/qannotation.h
@@ -77,6 +77,4 @@ private:
QT_END_NAMESPACE
-Q_DECLARE_METATYPE(Qt3D::QAnnotation *)
-
#endif // QT3D_QANNOTATION_H
diff --git a/src/render/frontend/qeffect.h b/src/render/frontend/qeffect.h
index ce91357bd..5a395e083 100644
--- a/src/render/frontend/qeffect.h
+++ b/src/render/frontend/qeffect.h
@@ -76,6 +76,4 @@ private:
QT_END_NAMESPACE
-Q_DECLARE_METATYPE(Qt3D::QEffect*)
-
#endif // QT3D_QEFFECT_H
diff --git a/src/render/frontend/qopenglfilter.h b/src/render/frontend/qopenglfilter.h
index c648d2b73..6ff43c417 100644
--- a/src/render/frontend/qopenglfilter.h
+++ b/src/render/frontend/qopenglfilter.h
@@ -113,6 +113,4 @@ bool operator !=(const QOpenGLFilter &reference, const QOpenGLFilter &sample);
QT_END_NAMESPACE
-Q_DECLARE_METATYPE(Qt3D::QOpenGLFilter *)
-
#endif // QT3D_QOPENGLFILTER_H
diff --git a/src/render/frontend/qparameter.h b/src/render/frontend/qparameter.h
index 01268e15b..6cb363e21 100644
--- a/src/render/frontend/qparameter.h
+++ b/src/render/frontend/qparameter.h
@@ -86,6 +86,4 @@ private:
QT_END_NAMESPACE
-Q_DECLARE_METATYPE(Qt3D::QParameter *)
-
#endif // QT3D_PARAMETER_H
diff --git a/src/render/frontend/qrenderpass.h b/src/render/frontend/qrenderpass.h
index 1f401860d..4b0fe79a9 100644
--- a/src/render/frontend/qrenderpass.h
+++ b/src/render/frontend/qrenderpass.h
@@ -106,6 +106,4 @@ private:
QT_END_NAMESPACE
-Q_DECLARE_METATYPE(Qt3D::QRenderPass *)
-
#endif // QT3D_QRENDERPASS_H
diff --git a/src/render/frontend/qshaderdata.h b/src/render/frontend/qshaderdata.h
index f526dcfc1..577d4fd79 100644
--- a/src/render/frontend/qshaderdata.h
+++ b/src/render/frontend/qshaderdata.h
@@ -83,6 +83,4 @@ private:
QT_END_NAMESPACE
-Q_DECLARE_METATYPE(Qt3D::QShaderData*)
-
#endif // QT3D_QSHADERDATA_H
diff --git a/src/render/frontend/qshaderprogram.h b/src/render/frontend/qshaderprogram.h
index 4023980a8..94383302b 100644
--- a/src/render/frontend/qshaderprogram.h
+++ b/src/render/frontend/qshaderprogram.h
@@ -114,6 +114,4 @@ private:
QT_END_NAMESPACE
-Q_DECLARE_METATYPE(Qt3D::QShaderProgram *)
-
#endif // QT3D_QSHADERPROGRAM_H
diff --git a/src/render/frontend/qtechnique.h b/src/render/frontend/qtechnique.h
index 199a7d57a..d3d2bf559 100644
--- a/src/render/frontend/qtechnique.h
+++ b/src/render/frontend/qtechnique.h
@@ -88,6 +88,4 @@ private:
QT_END_NAMESPACE
-Q_DECLARE_METATYPE(Qt3D::QTechnique *)
-
#endif // QT3D_QTECHNIQUE_H
diff --git a/src/render/frontend/qtextureimage.h b/src/render/frontend/qtextureimage.h
index e5f078b75..cf08f7b2b 100644
--- a/src/render/frontend/qtextureimage.h
+++ b/src/render/frontend/qtextureimage.h
@@ -75,6 +75,4 @@ private:
QT_END_NAMESPACE
-Q_DECLARE_METATYPE(Qt3D::QTextureImage*)
-
#endif // QT3D_QTEXTUREIMAGE_H
diff --git a/src/render/frontend/qwrapmode.h b/src/render/frontend/qwrapmode.h
index d0333c749..1fac8d153 100644
--- a/src/render/frontend/qwrapmode.h
+++ b/src/render/frontend/qwrapmode.h
@@ -87,6 +87,4 @@ private:
QT_END_NAMESPACE
-Q_DECLARE_METATYPE(Qt3D::QTextureWrapMode*)
-
#endif // QT3D_QWRAPMODE_H