diff options
author | Paul Lemire <paul.lemire350@gmail.com> | 2016-09-01 18:08:42 +0200 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2016-11-23 17:51:39 +0000 |
commit | 11a99ee63c673f709eecaefa3540477685960e35 (patch) | |
tree | 9e699a9ef07799b457aaa05756b83b2e82436c2b | |
parent | 97c797975802f5a0763a4ac602dfaa97ca0ba015 (diff) |
LCOV exclusion comments squashed
This is a combination of 60 commits.
qlockableobserverinterface_p.h: add LCOV exclusion comments
qobserverinterface_p.h: add LCOV exclusion comments
qpostman_p.h: add LCOV exclusion comments
qsceneobserverinterface_p.h: add LCOV exclusion comments
qscene_p.h: add LCOV exclusion comments
qnodeid.h: add LCOV exclusion comments
quick3dshaderdataarray_p.h: add LCOV exclusion comments
quick3dshaderdata_p.h: add LCOV exclusion comments
qquaternionanimation_p.h: add LCOV exclusion comments
qabstractphysicaldeviceproxy_p.h: add LCOV exclusion comments
qmouseevent.h: add LCOV exclusion comments
qmousedevice.h: add LCOV exclusion comments
qaxisaccumulator.h: add LCOV exclusion comments
qtextureimagedatagenerator.h: add LCOV exclusion comments
qtexturewrapmode.h: add LCOV exclusion comments
qabstracttexture.h: add LCOV exclusion comments
qtextureimage.h: add LCOV exclusion comments
texture_p.h: add LCOV exclusion comments
qtexturegenerator.h: add LCOV exclusion comments
qsortpolicy.h: add LCOV exclusion comments
qrendertargetselector.h: add LCOV exclusion comments
qsortcriterion.h: add LCOV exclusion comments
qclearbuffers.h: add LCOV exclusion comments
qrendercapture_p.h: add LCOV exclusion comments
uniform_p.h: add LCOV exclusion comments
triangleboundingvolume_p.h: add LCOV exclusion comments
qgeometryfactory.h: add LCOV exclusion comments
qbuffer_p.h: add LCOV exclusion comments
qbuffer.h: add LCOV exclusion comments
qgeometryrenderer.h: add LCOV exclusion comments
qbufferdatagenerator.h: add LCOV exclusion comments
qattribute.h: add LCOV exclusion comments
qsceneiohandler_p.h: add LCOV exclusion comments
qsceneloader.h: add LCOV exclusion comments
qrendersettings.h: add LCOV exclusion comments
qcamera.h: add LCOV exclusion comments
qcameralens.h: add LCOV exclusion comments
sphere_p.h: add LCOV exclusion comments
shaderdata_p.h: add LCOV exclusion comments
qshaderdata.h: add LCOV exclusion comments
qgraphicsapifilter.h: add LCOV exclusion comments
qshaderprogram.h: add LCOV exclusion comments
qpointsize.h: add LCOV exclusion comments
qblendequation.h: add LCOV exclusion comments
qstenciltestarguments.h: add LCOV exclusion comments
qalphatest.h: add LCOV exclusion comments
qstenciloperationarguments.h: add LCOV exclusion comments
qdepthtest.h: add LCOV exclusion comments
qblendequationarguments.h: add LCOV exclusion comments
qfrontface.h: add LCOV exclusion comments
qcullface.h: add LCOV exclusion comments
qray3d_p.h: add LCOV exclusion comments
qboundingvolume_p.h: add LCOV exclusion comments
qabstractcollisionqueryservice_p.h: add LCOV exclusion comments
qpickevent.h: add LCOV exclusion comments
qabstractlight.h: add LCOV exclusion comments
light_p.h: add LCOV exclusion comments
qt3dquickwindow.h: add LCOV exclusion comments
scene3ditem_p.h: add LCOV exclusion comments
qgraphicsapifilter_p.h: add LCOV exclusion comments
Change-Id: I3af0e2a4d85685c919dbfaa8b3f384777f026542
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
60 files changed, 81 insertions, 81 deletions
diff --git a/src/core/nodes/qnodeid.h b/src/core/nodes/qnodeid.h index c33638ce9..7e8b1c97c 100644 --- a/src/core/nodes/qnodeid.h +++ b/src/core/nodes/qnodeid.h @@ -116,7 +116,7 @@ inline Q_DECL_CONSTEXPR uint qHash(QNodeId id, uint seed = 0) Q_DECL_NOTHROW QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3DCore::QNodeId) +Q_DECLARE_METATYPE(Qt3DCore::QNodeId) // LCOV_EXCL_LINE #endif // QT3DCORE_QNODEID_H diff --git a/src/core/qlockableobserverinterface_p.h b/src/core/qlockableobserverinterface_p.h index 1d6878c22..b33a84ec4 100644 --- a/src/core/qlockableobserverinterface_p.h +++ b/src/core/qlockableobserverinterface_p.h @@ -72,6 +72,6 @@ public: QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3DCore::QLockableObserverInterface *) +Q_DECLARE_METATYPE(Qt3DCore::QLockableObserverInterface *) // LCOV_EXCL_LINE #endif // QT3DCORE_QLOCKABLEOBSERVERINTERFACE_P_H diff --git a/src/core/qobserverinterface_p.h b/src/core/qobserverinterface_p.h index 9763883fb..f2ed52aab 100644 --- a/src/core/qobserverinterface_p.h +++ b/src/core/qobserverinterface_p.h @@ -68,6 +68,6 @@ public: QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3DCore::QObserverInterface *) +Q_DECLARE_METATYPE(Qt3DCore::QObserverInterface *) // LCOV_EXCL_LINE #endif // QT3DCORE_QOBSERVERINTERFACE_P_H diff --git a/src/core/qpostman_p.h b/src/core/qpostman_p.h index edfe69c29..4fe788960 100644 --- a/src/core/qpostman_p.h +++ b/src/core/qpostman_p.h @@ -94,6 +94,6 @@ private: QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3DCore::QAbstractPostman*) +Q_DECLARE_METATYPE(Qt3DCore::QAbstractPostman*) // LCOV_EXCL_LINE #endif // QT3DCORE_QPOSTMAN_P_H diff --git a/src/core/qscene_p.h b/src/core/qscene_p.h index 59c609de7..6b4009538 100644 --- a/src/core/qscene_p.h +++ b/src/core/qscene_p.h @@ -101,6 +101,6 @@ private: QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3DCore::QScene*) +Q_DECLARE_METATYPE(Qt3DCore::QScene*) // LCOV_EXCL_LINE #endif // QT3DCORE_QSCENE_P_H diff --git a/src/core/qsceneobserverinterface_p.h b/src/core/qsceneobserverinterface_p.h index 4cbe9e3f0..77b1c3626 100644 --- a/src/core/qsceneobserverinterface_p.h +++ b/src/core/qsceneobserverinterface_p.h @@ -76,6 +76,6 @@ private: QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3DCore::QSceneObserverInterface *) +Q_DECLARE_METATYPE(Qt3DCore::QSceneObserverInterface *) // LCOV_EXCL_LINE #endif // QT3DCORE_QSCENEOBSERVERINTERFACE_P_H diff --git a/src/input/frontend/qabstractphysicaldeviceproxy_p.h b/src/input/frontend/qabstractphysicaldeviceproxy_p.h index 6a3d051bd..1175f53bb 100644 --- a/src/input/frontend/qabstractphysicaldeviceproxy_p.h +++ b/src/input/frontend/qabstractphysicaldeviceproxy_p.h @@ -71,7 +71,7 @@ public: Ready = 0, NotFound }; - Q_ENUM(DeviceStatus) + Q_ENUM(DeviceStatus) // LCOV_EXCL_LINE QString deviceName() const; DeviceStatus status() const; diff --git a/src/input/frontend/qaxisaccumulator.h b/src/input/frontend/qaxisaccumulator.h index c62e4c35f..461f21c4a 100644 --- a/src/input/frontend/qaxisaccumulator.h +++ b/src/input/frontend/qaxisaccumulator.h @@ -63,7 +63,7 @@ public: Velocity, Acceleration }; - Q_ENUM(SourceAxisType) + Q_ENUM(SourceAxisType) // LCOV_EXCL_LINE QAxisAccumulator(Qt3DCore::QNode *parent = nullptr); ~QAxisAccumulator(); diff --git a/src/input/frontend/qmousedevice.h b/src/input/frontend/qmousedevice.h index 6d6c6df77..620c41edc 100644 --- a/src/input/frontend/qmousedevice.h +++ b/src/input/frontend/qmousedevice.h @@ -67,7 +67,7 @@ public: WheelX, WheelY }; - Q_ENUM(Axis) + Q_ENUM(Axis) // LCOV_EXCL_LINE int axisCount() const Q_DECL_FINAL; int buttonCount() const Q_DECL_FINAL; @@ -96,6 +96,6 @@ private: QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3DInput::QMouseDevice*) +Q_DECLARE_METATYPE(Qt3DInput::QMouseDevice*) // LCOV_EXCL_LINE #endif // QT3DINPUT_QMOUSEDEVICE_H diff --git a/src/input/frontend/qmouseevent.h b/src/input/frontend/qmouseevent.h index 337ae06d8..c1051dc1f 100644 --- a/src/input/frontend/qmouseevent.h +++ b/src/input/frontend/qmouseevent.h @@ -68,7 +68,7 @@ public: BackButton = Qt::BackButton, NoButton = Qt::NoButton }; - Q_ENUM(Buttons) + Q_ENUM(Buttons) // LCOV_EXCL_LINE enum Modifiers { NoModifier = Qt::NoModifier, @@ -78,7 +78,7 @@ public: MetaModifier = Qt::MetaModifier, KeypadModifier = Qt::KeypadModifier }; - Q_ENUM(Modifiers) + Q_ENUM(Modifiers) // LCOV_EXCL_LINE explicit QMouseEvent(const QT_PREPEND_NAMESPACE(QMouseEvent) &e); ~QMouseEvent(); @@ -118,7 +118,7 @@ public: BackButton = Qt::BackButton, NoButton = Qt::NoButton }; - Q_ENUM(Buttons) + Q_ENUM(Buttons) // LCOV_EXCL_LINE enum Modifiers { NoModifier = Qt::NoModifier, @@ -128,7 +128,7 @@ public: MetaModifier = Qt::MetaModifier, KeypadModifier = Qt::KeypadModifier }; - Q_ENUM(Modifiers) + Q_ENUM(Modifiers) // LCOV_EXCL_LINE explicit QWheelEvent(const QT_PREPEND_NAMESPACE(QWheelEvent) &e); ~QWheelEvent(); @@ -153,7 +153,7 @@ typedef QSharedPointer<QWheelEvent> QWheelEventPtr; QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3DInput::QMouseEvent*) -Q_DECLARE_METATYPE(Qt3DInput::QWheelEvent*) +Q_DECLARE_METATYPE(Qt3DInput::QMouseEvent*) // LCOV_EXCL_LINE +Q_DECLARE_METATYPE(Qt3DInput::QWheelEvent*) // LCOV_EXCL_LINE #endif // QT3DINPUT_QMOUSEEVENT_H diff --git a/src/quick3d/imports/scene3d/scene3ditem_p.h b/src/quick3d/imports/scene3d/scene3ditem_p.h index bb141b423..09859a763 100644 --- a/src/quick3d/imports/scene3d/scene3ditem_p.h +++ b/src/quick3d/imports/scene3d/scene3ditem_p.h @@ -93,7 +93,7 @@ public: AutomaticAspectRatio, UserAspectRatio }; - Q_ENUM(CameraAspectRatioMode); + Q_ENUM(CameraAspectRatioMode); // LCOV_EXCL_LINE CameraAspectRatioMode cameraAspectRatioMode() const; public Q_SLOTS: diff --git a/src/quick3d/quick3d/qquaternionanimation_p.h b/src/quick3d/quick3d/qquaternionanimation_p.h index 92056f24e..3c5f092c4 100644 --- a/src/quick3d/quick3d/qquaternionanimation_p.h +++ b/src/quick3d/quick3d/qquaternionanimation_p.h @@ -83,7 +83,7 @@ public: Slerp = 0, Nlerp }; - Q_ENUM(Type) + Q_ENUM(Type) // LCOV_EXCL_LINE QQuaternionAnimation(QObject *parent = 0); diff --git a/src/quick3d/quick3dextras/qt3dquickwindow.h b/src/quick3d/quick3dextras/qt3dquickwindow.h index d278a3194..a8703093e 100644 --- a/src/quick3d/quick3dextras/qt3dquickwindow.h +++ b/src/quick3d/quick3dextras/qt3dquickwindow.h @@ -104,7 +104,7 @@ public: AutomaticAspectRatio, UserAspectRatio }; - Q_ENUM(CameraAspectRatioMode); + Q_ENUM(CameraAspectRatioMode); // LCOV_EXCL_LINE void setCameraAspectRatioMode(CameraAspectRatioMode mode); CameraAspectRatioMode cameraAspectRatioMode() const; diff --git a/src/quick3d/quick3drender/items/quick3dshaderdata_p.h b/src/quick3d/quick3drender/items/quick3dshaderdata_p.h index 72c117c90..15e127b78 100644 --- a/src/quick3d/quick3drender/items/quick3dshaderdata_p.h +++ b/src/quick3d/quick3drender/items/quick3dshaderdata_p.h @@ -76,6 +76,6 @@ public: QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3DRender::Render::Quick::Quick3DShaderData*) +Q_DECLARE_METATYPE(Qt3DRender::Render::Quick::Quick3DShaderData*) // LCOV_EXCL_LINE #endif // QT3DRENDER_RENDER_QUICK_QUICK3DSHADERDATA_P_H diff --git a/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h b/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h index effd18b32..9d33df208 100644 --- a/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h +++ b/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h @@ -93,6 +93,6 @@ private: QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3DRender::Render::Quick::Quick3DShaderDataArray*) +Q_DECLARE_METATYPE(Qt3DRender::Render::Quick::Quick3DShaderDataArray*) // LCOV_EXCL_LINE #endif // QT3DRENDER_RENDER_QUICK_QUICK3DSHADERDATAARRAY_P_H diff --git a/src/render/backend/triangleboundingvolume_p.h b/src/render/backend/triangleboundingvolume_p.h index 5ce0f1574..cc394041b 100644 --- a/src/render/backend/triangleboundingvolume_p.h +++ b/src/render/backend/triangleboundingvolume_p.h @@ -108,6 +108,6 @@ private: QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3DRender::Render::TriangleBoundingVolume*) +Q_DECLARE_METATYPE(Qt3DRender::Render::TriangleBoundingVolume*) // LCOV_EXCL_LINE #endif // QT3DRENDER_RENDER_TRIANGLEBOUNDINGVOLUME_P_H diff --git a/src/render/backend/uniform_p.h b/src/render/backend/uniform_p.h index dc16365a0..56a50aea2 100644 --- a/src/render/backend/uniform_p.h +++ b/src/render/backend/uniform_p.h @@ -206,6 +206,6 @@ private: QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3DRender::Render::UniformType) +Q_DECLARE_METATYPE(Qt3DRender::Render::UniformType) // LCOV_EXCL_LINE #endif // QT3DRENDER_RENDER_UNIFORM_P_H diff --git a/src/render/framegraph/qclearbuffers.h b/src/render/framegraph/qclearbuffers.h index d45af9ce0..91828c222 100644 --- a/src/render/framegraph/qclearbuffers.h +++ b/src/render/framegraph/qclearbuffers.h @@ -74,7 +74,7 @@ public: ColorDepthStencilBuffer = ColorBuffer | DepthStencilBuffer, AllBuffers = 0xFFFFFFFF }; - Q_ENUM(BufferType) + Q_ENUM(BufferType) // LCOV_EXCL_LINE Q_DECLARE_FLAGS(BufferTypeFlags, BufferType) BufferType buffers() const; diff --git a/src/render/framegraph/qrendercapture_p.h b/src/render/framegraph/qrendercapture_p.h index 09d983ede..0d7c2d3af 100644 --- a/src/render/framegraph/qrendercapture_p.h +++ b/src/render/framegraph/qrendercapture_p.h @@ -99,6 +99,6 @@ typedef QSharedPointer<RenderCaptureData> RenderCaptureDataPtr; QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3DRender::RenderCaptureDataPtr) +Q_DECLARE_METATYPE(Qt3DRender::RenderCaptureDataPtr) // LCOV_EXCL_LINE #endif // QRENDERCAPTURE_P_H diff --git a/src/render/framegraph/qrendertargetselector.h b/src/render/framegraph/qrendertargetselector.h index a92fe1335..68fbe2666 100644 --- a/src/render/framegraph/qrendertargetselector.h +++ b/src/render/framegraph/qrendertargetselector.h @@ -83,6 +83,6 @@ private: QT_END_NAMESPACE -Q_DECLARE_METATYPE(QVector<Qt3DRender::QRenderTargetOutput::AttachmentPoint>) +Q_DECLARE_METATYPE(QVector<Qt3DRender::QRenderTargetOutput::AttachmentPoint>) // LCOV_EXCL_LINE #endif // QT3DRENDER_QRENDERTARGETSELECTOR_H diff --git a/src/render/framegraph/qsortcriterion.h b/src/render/framegraph/qsortcriterion.h index bf2821550..230f111f9 100644 --- a/src/render/framegraph/qsortcriterion.h +++ b/src/render/framegraph/qsortcriterion.h @@ -61,7 +61,7 @@ public: BackToFront = (1 << 1), Material = (1 << 2) }; - Q_ENUM(SortType) + Q_ENUM(SortType) // LCOV_EXCL_LINE SortType sort() const; diff --git a/src/render/framegraph/qsortpolicy.h b/src/render/framegraph/qsortpolicy.h index 010fa461b..2d96bdbd6 100644 --- a/src/render/framegraph/qsortpolicy.h +++ b/src/render/framegraph/qsortpolicy.h @@ -61,7 +61,7 @@ public: BackToFront = (1 << 1), Material = (1 << 2) }; - Q_ENUM(SortType) + Q_ENUM(SortType) // LCOV_EXCL_LINE QVector<SortType> sortTypes() const; QVector<int> sortTypesInt() const; diff --git a/src/render/frontend/qcamera.h b/src/render/frontend/qcamera.h index 9c2997ba0..f5bd49fa2 100644 --- a/src/render/frontend/qcamera.h +++ b/src/render/frontend/qcamera.h @@ -87,7 +87,7 @@ public: TranslateViewCenter, DontTranslateViewCenter }; - Q_ENUM(CameraTranslationOption) + Q_ENUM(CameraTranslationOption) // LCOV_EXCL_LINE QCameraLens *lens() const; Qt3DCore::QTransform *transform() const; diff --git a/src/render/frontend/qcameralens.h b/src/render/frontend/qcameralens.h index 6739369dc..ad414cada 100644 --- a/src/render/frontend/qcameralens.h +++ b/src/render/frontend/qcameralens.h @@ -77,7 +77,7 @@ public: FrustumProjection, CustomProjection }; - Q_ENUM(ProjectionType) + Q_ENUM(ProjectionType) // LCOV_EXCL_LINE ProjectionType projectionType() const; float nearPlane() const; diff --git a/src/render/frontend/qrendersettings.h b/src/render/frontend/qrendersettings.h index 3d32dda6b..71da7c562 100644 --- a/src/render/frontend/qrendersettings.h +++ b/src/render/frontend/qrendersettings.h @@ -68,7 +68,7 @@ public: OnDemand, Always }; - Q_ENUM(RenderPolicy) + Q_ENUM(RenderPolicy) // LCOV_EXCL_LINE QPickingSettings* pickingSettings(); QFrameGraphNode *activeFrameGraph() const; diff --git a/src/render/frontend/sphere_p.h b/src/render/frontend/sphere_p.h index de93faa05..a30a12741 100644 --- a/src/render/frontend/sphere_p.h +++ b/src/render/frontend/sphere_p.h @@ -163,6 +163,6 @@ inline bool intersects(const Sphere &a, const Sphere &b) QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3DRender::Render::Sphere) +Q_DECLARE_METATYPE(Qt3DRender::Render::Sphere) // LCOV_EXCL_LINE #endif // QT3DRENDER_RENDER_SPHERE_H diff --git a/src/render/geometry/qattribute.h b/src/render/geometry/qattribute.h index 94c4f059b..3e413c659 100644 --- a/src/render/geometry/qattribute.h +++ b/src/render/geometry/qattribute.h @@ -77,7 +77,7 @@ public: IndexAttribute }; - Q_ENUM(AttributeType) + Q_ENUM(AttributeType) // LCOV_EXCL_LINE enum VertexBaseType { Byte = 0, @@ -90,7 +90,7 @@ public: Float, Double }; - Q_ENUM(VertexBaseType) + Q_ENUM(VertexBaseType) // LCOV_EXCL_LINE explicit QAttribute(QNode *parent = nullptr); explicit QAttribute(QBuffer *buf, VertexBaseType vertexBaseType, uint vertexSize, uint count, uint offset = 0, uint stride = 0, QNode *parent = nullptr); diff --git a/src/render/geometry/qbuffer.h b/src/render/geometry/qbuffer.h index cf8bdcfb9..3827b04c9 100644 --- a/src/render/geometry/qbuffer.h +++ b/src/render/geometry/qbuffer.h @@ -70,7 +70,7 @@ public: UniformBuffer = 0x8A11, // GL_UNIFORM_BUFFER ShaderStorageBuffer = 0x90D2 // GL_SHADER_STORAGE_BUFFER }; - Q_ENUM(BufferType) + Q_ENUM(BufferType) // LCOV_EXCL_LINE enum UsageType { @@ -84,7 +84,7 @@ public: DynamicRead = 0x88E9, // GL_DYNAMIC_READ DynamicCopy = 0x88EA // GL_DYNAMIC_COPY }; - Q_ENUM(UsageType) + Q_ENUM(UsageType) // LCOV_EXCL_LINE explicit QBuffer(BufferType ty = QBuffer::VertexBuffer, Qt3DCore::QNode *parent = nullptr); ~QBuffer(); diff --git a/src/render/geometry/qbuffer_p.h b/src/render/geometry/qbuffer_p.h index 7759a279f..eb69730b8 100644 --- a/src/render/geometry/qbuffer_p.h +++ b/src/render/geometry/qbuffer_p.h @@ -94,6 +94,6 @@ struct QBufferUpdate } // namespace Qt3DRender QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3DRender::QBufferUpdate) +Q_DECLARE_METATYPE(Qt3DRender::QBufferUpdate) // LCOV_EXCL_LINE #endif // QT3DRENDER_QBUFFER_P_H diff --git a/src/render/geometry/qbufferdatagenerator.h b/src/render/geometry/qbufferdatagenerator.h index 2b37ec24d..702f396d4 100644 --- a/src/render/geometry/qbufferdatagenerator.h +++ b/src/render/geometry/qbufferdatagenerator.h @@ -62,7 +62,7 @@ typedef QSharedPointer<QBufferDataGenerator> QBufferDataGeneratorPtr; QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3DRender::QBufferDataGeneratorPtr) +Q_DECLARE_METATYPE(Qt3DRender::QBufferDataGeneratorPtr) // LCOV_EXCL_LINE #endif // QT3DRENDER_QBUFFERDATAGENERATOR diff --git a/src/render/geometry/qgeometryfactory.h b/src/render/geometry/qgeometryfactory.h index affcc0e52..d5d88a45d 100644 --- a/src/render/geometry/qgeometryfactory.h +++ b/src/render/geometry/qgeometryfactory.h @@ -64,7 +64,7 @@ typedef QSharedPointer<QGeometryFactory> QGeometryFactoryPtr; QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3DRender::QGeometryFactoryPtr) +Q_DECLARE_METATYPE(Qt3DRender::QGeometryFactoryPtr) // LCOV_EXCL_LINE #endif // QT3DRENDER_QGEOMETRYFACTORY diff --git a/src/render/geometry/qgeometryrenderer.h b/src/render/geometry/qgeometryrenderer.h index be3bb6146..28d580990 100644 --- a/src/render/geometry/qgeometryrenderer.h +++ b/src/render/geometry/qgeometryrenderer.h @@ -85,7 +85,7 @@ public: TriangleStripAdjacency = 0x000D, Patches = 0x000E }; - Q_ENUM(PrimitiveType) + Q_ENUM(PrimitiveType) // LCOV_EXCL_LINE // how to figure out index count and all the fancy stuff that QMeshData provides for us? // also how to figure out which attribute(s?) hold the indices? diff --git a/src/render/io/qsceneiohandler_p.h b/src/render/io/qsceneiohandler_p.h index c6f65ea82..ebebc440d 100644 --- a/src/render/io/qsceneiohandler_p.h +++ b/src/render/io/qsceneiohandler_p.h @@ -80,7 +80,7 @@ public: Loaded, Error }; - Q_ENUM(ParserStatus) + Q_ENUM(ParserStatus) // LCOV_EXCL_LINE QSceneIOHandler(); virtual ~QSceneIOHandler(); diff --git a/src/render/io/qsceneloader.h b/src/render/io/qsceneloader.h index 43d97ec51..fe75185ae 100644 --- a/src/render/io/qsceneloader.h +++ b/src/render/io/qsceneloader.h @@ -67,7 +67,7 @@ public: Ready, Error }; - Q_ENUM(Status) + Q_ENUM(Status) // LCOV_EXCL_LINE QUrl source() const; Status status() const; diff --git a/src/render/lights/light_p.h b/src/render/lights/light_p.h index 31901bf11..19deb1bcc 100644 --- a/src/render/lights/light_p.h +++ b/src/render/lights/light_p.h @@ -92,6 +92,6 @@ private: QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3DRender::Render::Light*) +Q_DECLARE_METATYPE(Qt3DRender::Render::Light*) // LCOV_EXCL_LINE #endif // QT3DRENDER_RENDER_LIGHT_P_H diff --git a/src/render/lights/qabstractlight.h b/src/render/lights/qabstractlight.h index 7cc98b57b..33a88b215 100644 --- a/src/render/lights/qabstractlight.h +++ b/src/render/lights/qabstractlight.h @@ -67,7 +67,7 @@ public: DirectionalLight, SpotLight }; - Q_ENUM(Type) + Q_ENUM(Type) // LCOV_EXCL_LINE Type type() const; QColor color() const; diff --git a/src/render/materialsystem/qgraphicsapifilter.h b/src/render/materialsystem/qgraphicsapifilter.h index c618358dd..488d8bd4b 100644 --- a/src/render/materialsystem/qgraphicsapifilter.h +++ b/src/render/materialsystem/qgraphicsapifilter.h @@ -67,14 +67,14 @@ public: OpenGLES = QSurfaceFormat::OpenGLES, OpenGL = QSurfaceFormat::OpenGL }; - Q_ENUM(Api) + Q_ENUM(Api) // LCOV_EXCL_LINE enum OpenGLProfile { NoProfile = QSurfaceFormat::NoProfile, CoreProfile = QSurfaceFormat::CoreProfile, CompatibilityProfile = QSurfaceFormat::CompatibilityProfile }; - Q_ENUM(OpenGLProfile) + Q_ENUM(OpenGLProfile) // LCOV_EXCL_LINE explicit QGraphicsApiFilter(QObject *parent = nullptr); ~QGraphicsApiFilter(); diff --git a/src/render/materialsystem/qgraphicsapifilter_p.h b/src/render/materialsystem/qgraphicsapifilter_p.h index fed9df2ab..9bcc4b3f1 100644 --- a/src/render/materialsystem/qgraphicsapifilter_p.h +++ b/src/render/materialsystem/qgraphicsapifilter_p.h @@ -92,6 +92,6 @@ public: QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3DRender::GraphicsApiFilterData); +Q_DECLARE_METATYPE(Qt3DRender::GraphicsApiFilterData); // LCOV_EXCL_LINE #endif // QT3DRENDER_QGRAPHICSAPIFILTER_P_H diff --git a/src/render/materialsystem/qshaderdata.h b/src/render/materialsystem/qshaderdata.h index 767f4043f..e695d1eb0 100644 --- a/src/render/materialsystem/qshaderdata.h +++ b/src/render/materialsystem/qshaderdata.h @@ -82,7 +82,7 @@ private: QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3DRender::QShaderData*) -Q_DECLARE_METATYPE(QVector<Qt3DRender::QShaderData*>) +Q_DECLARE_METATYPE(Qt3DRender::QShaderData*) // LCOV_EXCL_LINE +Q_DECLARE_METATYPE(QVector<Qt3DRender::QShaderData*>) // LCOV_EXCL_LINE #endif // QT3DRENDER_QSHADERDATA_H diff --git a/src/render/materialsystem/qshaderprogram.h b/src/render/materialsystem/qshaderprogram.h index f5a577de5..442a25b2e 100644 --- a/src/render/materialsystem/qshaderprogram.h +++ b/src/render/materialsystem/qshaderprogram.h @@ -71,7 +71,7 @@ public: Geometry, Compute }; - Q_ENUM(ShaderType) + Q_ENUM(ShaderType) // LCOV_EXCL_LINE // Source code in-line QByteArray vertexShaderCode() const; diff --git a/src/render/materialsystem/shaderdata_p.h b/src/render/materialsystem/shaderdata_p.h index 6ce0c734c..987687eab 100644 --- a/src/render/materialsystem/shaderdata_p.h +++ b/src/render/materialsystem/shaderdata_p.h @@ -145,6 +145,6 @@ private: QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3DRender::Render::ShaderData*) +Q_DECLARE_METATYPE(Qt3DRender::Render::ShaderData*) // LCOV_EXCL_LINE #endif // QT3DRENDER_RENDER_SHADERDATA_P_H diff --git a/src/render/picking/qpickevent.h b/src/render/picking/qpickevent.h index cd925f7ea..3fbee0d30 100644 --- a/src/render/picking/qpickevent.h +++ b/src/render/picking/qpickevent.h @@ -73,7 +73,7 @@ public: BackButton = Qt::BackButton, NoButton = Qt::NoButton }; - Q_ENUM(Buttons) + Q_ENUM(Buttons) // LCOV_EXCL_LINE enum Modifiers { NoModifier = Qt::NoModifier, @@ -83,7 +83,7 @@ public: MetaModifier = Qt::MetaModifier, KeypadModifier = Qt::KeypadModifier }; - Q_ENUM(Modifiers) + Q_ENUM(Modifiers) // LCOV_EXCL_LINE QPickEvent(); QPickEvent(const QPointF &position, const QVector3D& worldIntersection, const QVector3D& localIntersection, float distance); @@ -118,6 +118,6 @@ private: QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3DRender::QPickEvent*) +Q_DECLARE_METATYPE(Qt3DRender::QPickEvent*) // LCOV_EXCL_LINE #endif // QT3DRENDER_QPICKEVENT_H diff --git a/src/render/raycasting/qabstractcollisionqueryservice_p.h b/src/render/raycasting/qabstractcollisionqueryservice_p.h index a2bb7873b..d26eacb98 100644 --- a/src/render/raycasting/qabstractcollisionqueryservice_p.h +++ b/src/render/raycasting/qabstractcollisionqueryservice_p.h @@ -105,6 +105,6 @@ private: QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3DRender::QAbstractCollisionQueryService::QueryMode) +Q_DECLARE_METATYPE(Qt3DRender::QAbstractCollisionQueryService::QueryMode) // LCOV_EXCL_LINE #endif // QT3DRENDER_QABSTRACTCOLLISIONQUERYSERVICE_P_H diff --git a/src/render/raycasting/qboundingvolume_p.h b/src/render/raycasting/qboundingvolume_p.h index 87f7e45f5..a69530246 100644 --- a/src/render/raycasting/qboundingvolume_p.h +++ b/src/render/raycasting/qboundingvolume_p.h @@ -79,6 +79,6 @@ public: QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3DRender::QBoundingVolume*) +Q_DECLARE_METATYPE(Qt3DRender::QBoundingVolume*) // LCOV_EXCL_LINE #endif // QT3DRENDER_QBOUNDINGVOLUME_P_H diff --git a/src/render/raycasting/qray3d_p.h b/src/render/raycasting/qray3d_p.h index 3e454e7c8..d1fce726d 100644 --- a/src/render/raycasting/qray3d_p.h +++ b/src/render/raycasting/qray3d_p.h @@ -118,6 +118,6 @@ inline bool qFuzzyCompare(const Qt3DRender::QRay3D &ray1, const Qt3DRender::QRay qFuzzyCompare(ray1.direction(), ray2.direction()); } -Q_DECLARE_METATYPE(Qt3DRender::QRay3D) +Q_DECLARE_METATYPE(Qt3DRender::QRay3D) // LCOV_EXCL_LINE #endif // QT3DRENDER_QRAY3D_H diff --git a/src/render/renderstates/qalphatest.h b/src/render/renderstates/qalphatest.h index 49a5fac43..67106ade5 100644 --- a/src/render/renderstates/qalphatest.h +++ b/src/render/renderstates/qalphatest.h @@ -66,7 +66,7 @@ public: Greater = 0x0204, NotEqual = 0x0205 }; - Q_ENUM(AlphaFunction) + Q_ENUM(AlphaFunction) // LCOV_EXCL_LINE explicit QAlphaTest(Qt3DCore::QNode *parent = nullptr); ~QAlphaTest(); diff --git a/src/render/renderstates/qblendequation.h b/src/render/renderstates/qblendequation.h index 6810cf96e..8bdfe4907 100644 --- a/src/render/renderstates/qblendequation.h +++ b/src/render/renderstates/qblendequation.h @@ -63,7 +63,7 @@ public: Min = 0x8007, Max = 0x8008 }; - Q_ENUM(BlendFunction) + Q_ENUM(BlendFunction) // LCOV_EXCL_LINE explicit QBlendEquation(Qt3DCore::QNode *parent = nullptr); ~QBlendEquation(); diff --git a/src/render/renderstates/qblendequationarguments.h b/src/render/renderstates/qblendequationarguments.h index 8fd5d8281..5f613770a 100644 --- a/src/render/renderstates/qblendequationarguments.h +++ b/src/render/renderstates/qblendequationarguments.h @@ -83,7 +83,7 @@ public: OneMinusSource1Color, OneMinusSource1Color0 = OneMinusSource1Color // ### Qt 6: Remove }; - Q_ENUM(Blending) + Q_ENUM(Blending) // LCOV_EXCL_LINE explicit QBlendEquationArguments(Qt3DCore::QNode *parent = nullptr); ~QBlendEquationArguments(); diff --git a/src/render/renderstates/qcullface.h b/src/render/renderstates/qcullface.h index 3474fe009..8598d3b88 100644 --- a/src/render/renderstates/qcullface.h +++ b/src/render/renderstates/qcullface.h @@ -64,7 +64,7 @@ public: Back = 0x0405, FrontAndBack = 0x0408 }; - Q_ENUM(CullingMode) + Q_ENUM(CullingMode) // LCOV_EXCL_LINE explicit QCullFace(Qt3DCore::QNode *parent = nullptr); ~QCullFace(); diff --git a/src/render/renderstates/qdepthtest.h b/src/render/renderstates/qdepthtest.h index 16b4a5b85..9482ef9a5 100644 --- a/src/render/renderstates/qdepthtest.h +++ b/src/render/renderstates/qdepthtest.h @@ -65,7 +65,7 @@ public: Greater = 0x0204, NotEqual = 0x0205 }; - Q_ENUM(DepthFunction) + Q_ENUM(DepthFunction) // LCOV_EXCL_LINE explicit QDepthTest(Qt3DCore::QNode *parent = nullptr); ~QDepthTest(); diff --git a/src/render/renderstates/qfrontface.h b/src/render/renderstates/qfrontface.h index dd8a7f5fe..0f1061280 100644 --- a/src/render/renderstates/qfrontface.h +++ b/src/render/renderstates/qfrontface.h @@ -60,7 +60,7 @@ public: ClockWise = 0x0900, CounterClockWise = 0x0901 }; - Q_ENUM(WindingDirection) + Q_ENUM(WindingDirection) // LCOV_EXCL_LINE explicit QFrontFace(Qt3DCore::QNode *parent = nullptr); ~QFrontFace(); diff --git a/src/render/renderstates/qpointsize.h b/src/render/renderstates/qpointsize.h index fdfa54a9c..621d983b8 100644 --- a/src/render/renderstates/qpointsize.h +++ b/src/render/renderstates/qpointsize.h @@ -58,7 +58,7 @@ public: Fixed = 0, Programmable = 1 }; - Q_ENUM(SizeMode) + Q_ENUM(SizeMode) // LCOV_EXCL_LINE explicit QPointSize(Qt3DCore::QNode *parent = nullptr); ~QPointSize(); diff --git a/src/render/renderstates/qstenciloperationarguments.h b/src/render/renderstates/qstenciloperationarguments.h index 31d32f4d5..db80ecc19 100644 --- a/src/render/renderstates/qstenciloperationarguments.h +++ b/src/render/renderstates/qstenciloperationarguments.h @@ -65,7 +65,7 @@ public: Back = 0x0405, FrontAndBack = 0x0408 }; - Q_ENUM(FaceMode) + Q_ENUM(FaceMode) // LCOV_EXCL_LINE enum Operation { @@ -78,7 +78,7 @@ public: DecrementWrap = 0x8508, Invert = 0x150A }; - Q_ENUM(Operation) + Q_ENUM(Operation) // LCOV_EXCL_LINE ~QStencilOperationArguments(); diff --git a/src/render/renderstates/qstenciltestarguments.h b/src/render/renderstates/qstenciltestarguments.h index 17d9fa21e..f20885d03 100644 --- a/src/render/renderstates/qstenciltestarguments.h +++ b/src/render/renderstates/qstenciltestarguments.h @@ -65,7 +65,7 @@ public: Back = 0x0405, FrontAndBack = 0x0408 }; - Q_ENUM(StencilFaceMode) + Q_ENUM(StencilFaceMode) // LCOV_EXCL_LINE enum StencilFunction { @@ -78,7 +78,7 @@ public: Greater = 0x0204, NotEqual = 0x0205 }; - Q_ENUM(StencilFunction) + Q_ENUM(StencilFunction) // LCOV_EXCL_LINE ~QStencilTestArguments(); diff --git a/src/render/texture/qabstracttexture.h b/src/render/texture/qabstracttexture.h index 0f1dc5dfe..53868b319 100644 --- a/src/render/texture/qabstracttexture.h +++ b/src/render/texture/qabstracttexture.h @@ -82,7 +82,7 @@ public: Ready, Error }; - Q_ENUM(Status) + Q_ENUM(Status) // LCOV_EXCL_LINE enum Target { TargetAutomatic = 0, // Target will be determined by the Qt3D engine @@ -98,7 +98,7 @@ public: TargetRectangle = 0x84F5, // GL_TEXTURE_RECTANGLE TargetBuffer = 0x8C2A // GL_TEXTURE_BUFFER }; - Q_ENUM(Target) + Q_ENUM(Target) // LCOV_EXCL_LINE enum TextureFormat { NoFormat = 0, // GL_NONE @@ -227,7 +227,7 @@ public: LuminanceFormat = 0x1909, // GL_LUMINANCE LuminanceAlphaFormat = 0x190A }; - Q_ENUM(TextureFormat) + Q_ENUM(TextureFormat) // LCOV_EXCL_LINE enum Filter { Nearest = 0x2600, // GL_NEAREST @@ -237,7 +237,7 @@ public: LinearMipMapNearest = 0x2701, // GL_LINEAR_MIPMAP_NEAREST LinearMipMapLinear = 0x2703 // GL_LINEAR_MIPMAP_LINEAR }; - Q_ENUM(Filter) + Q_ENUM(Filter) // LCOV_EXCL_LINE enum CubeMapFace { CubeMapPositiveX = 0x8515, // GL_TEXTURE_CUBE_MAP_POSITIVE_X @@ -248,7 +248,7 @@ public: CubeMapNegativeZ = 0x851A, // GL_TEXTURE_CUBE_MAP_NEGATIVE_Z AllFaces }; - Q_ENUM(CubeMapFace) + Q_ENUM(CubeMapFace) // LCOV_EXCL_LINE enum ComparisonFunction { CompareLessEqual = 0x0203, // GL_LEQUAL @@ -260,13 +260,13 @@ public: CompareAlways = 0x0207, // GL_ALWAYS CompareNever = 0x0200 // GL_NEVER }; - Q_ENUM(ComparisonFunction) + Q_ENUM(ComparisonFunction) // LCOV_EXCL_LINE enum ComparisonMode { CompareRefToTexture = 0x884E, // GL_COMPARE_REF_TO_TEXTURE CompareNone = 0x0000 // GL_NONE }; - Q_ENUM(ComparisonMode) + Q_ENUM(ComparisonMode) // LCOV_EXCL_LINE ~QAbstractTexture(); @@ -344,6 +344,6 @@ private: QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3DRender::QAbstractTexture *) +Q_DECLARE_METATYPE(Qt3DRender::QAbstractTexture *) // LCOV_EXCL_LINE #endif // QT3DRENDER_QABSTRACTTEXTURE_H diff --git a/src/render/texture/qtexturegenerator.h b/src/render/texture/qtexturegenerator.h index 59bebde8c..faa9e1c7b 100644 --- a/src/render/texture/qtexturegenerator.h +++ b/src/render/texture/qtexturegenerator.h @@ -66,6 +66,6 @@ typedef QSharedPointer<QTextureGenerator> QTextureGeneratorPtr; QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3DRender::QTextureGeneratorPtr) +Q_DECLARE_METATYPE(Qt3DRender::QTextureGeneratorPtr) // LCOV_EXCL_LINE #endif // QT3DRENDER_QTEXTUREGENERATOR_H diff --git a/src/render/texture/qtextureimage.h b/src/render/texture/qtextureimage.h index c8d0121f8..e2ab54a1b 100644 --- a/src/render/texture/qtextureimage.h +++ b/src/render/texture/qtextureimage.h @@ -66,7 +66,7 @@ public: Ready, Error }; - Q_ENUM(Status) + Q_ENUM(Status) // LCOV_EXCL_LINE QUrl source() const; Status status() const; diff --git a/src/render/texture/qtextureimagedatagenerator.h b/src/render/texture/qtextureimagedatagenerator.h index eee7a8149..5213f3929 100644 --- a/src/render/texture/qtextureimagedatagenerator.h +++ b/src/render/texture/qtextureimagedatagenerator.h @@ -69,6 +69,6 @@ typedef QSharedPointer<QTextureImageDataGenerator> QTextureImageDataGeneratorPtr QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3DRender::QTextureImageDataGeneratorPtr) +Q_DECLARE_METATYPE(Qt3DRender::QTextureImageDataGeneratorPtr) // LCOV_EXCL_LINE #endif // QT3DRENDER_QTEXTUREIMAGEDATAGENERATOR_H diff --git a/src/render/texture/qtexturewrapmode.h b/src/render/texture/qtexturewrapmode.h index bb27acf4a..7349e654c 100644 --- a/src/render/texture/qtexturewrapmode.h +++ b/src/render/texture/qtexturewrapmode.h @@ -63,7 +63,7 @@ public: ClampToEdge = 0x812F, // GL_CLAMP_TO_EDGE ClampToBorder = 0x812D // GL_CLAMP_TO_BORDER }; - Q_ENUM(WrapMode) + Q_ENUM(WrapMode) // LCOV_EXCL_LINE explicit QTextureWrapMode(WrapMode wrapMode = ClampToEdge, QObject *parent = nullptr); explicit QTextureWrapMode(WrapMode x, WrapMode y, WrapMode z, QObject *parent = nullptr); diff --git a/src/render/texture/texture_p.h b/src/render/texture/texture_p.h index a02e66b3f..07e3791e9 100644 --- a/src/render/texture/texture_p.h +++ b/src/render/texture/texture_p.h @@ -190,6 +190,6 @@ private: QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3DRender::Render::Texture*) +Q_DECLARE_METATYPE(Qt3DRender::Render::Texture*) // LCOV_EXCL_LINE #endif // QT3DRENDER_RENDER_TEXTURE_H |