diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-06 14:22:19 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-02-10 17:56:00 +0000 |
| commit | 4684ce7bffbb0e753dce29f12aa3f6a25d1b29d4 (patch) | |
| tree | 5fbf1c22d80744df31a4d87412f5c85d1c1b2460 | |
| parent | 8a8db50002cbefafe9c5323ab6139c517f05ec8e (diff) | |
| download | qt3d-4684ce7bffbb0e753dce29f12aa3f6a25d1b29d4.tar.gz | |
3DCore: Remove using namespace Qt3DCore
It causes clashes in CMake Unity (Jumbo) builds
(3DCore::QBufferPrivate vs QBufferPrivate).
Task-number: QTBUG-109394
Change-Id: Ibb8a8f37b5da3531daeca1d82aef892d253ece7f
Reviewed-by: Inho Lee <inho.lee@qt.io>
Reviewed-by: Mike Krus <mike.krus@kdab.com>
(cherry picked from commit 3e6ef0e451016c07a6cdf24c733c1732d1343e78)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/core/aspect/coresettings.cpp | 4 | ||||
| -rw-r--r-- | src/core/aspect/qcoreaspect.cpp | 4 | ||||
| -rw-r--r-- | src/core/aspect/qcoresettings.cpp | 2 | ||||
| -rw-r--r-- | src/core/geometry/qbuffer.cpp | 2 | ||||
| -rw-r--r-- | src/core/geometry/qgeometry.cpp | 4 | ||||
| -rw-r--r-- | src/core/geometry/qgeometryview.cpp | 5 |
6 files changed, 12 insertions, 9 deletions
diff --git a/src/core/aspect/coresettings.cpp b/src/core/aspect/coresettings.cpp index 51f034ec8..df64fd614 100644 --- a/src/core/aspect/coresettings.cpp +++ b/src/core/aspect/coresettings.cpp @@ -6,7 +6,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; +namespace Qt3DCore { CoreSettings::CoreSettings() : QBackendNode() @@ -57,4 +57,6 @@ void CoreSettingsFunctor::destroy(Qt3DCore::QNodeId id) const m_settings = nullptr; } +} // namespace Qt3DCore + QT_END_NAMESPACE diff --git a/src/core/aspect/qcoreaspect.cpp b/src/core/aspect/qcoreaspect.cpp index 628734b9f..0f14d4326 100644 --- a/src/core/aspect/qcoreaspect.cpp +++ b/src/core/aspect/qcoreaspect.cpp @@ -11,7 +11,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; +namespace Qt3DCore { QCoreAspectPrivate::QCoreAspectPrivate() : Qt3DCore::QAbstractAspectPrivate() @@ -114,6 +114,8 @@ void QCoreAspect::frameDone() scene->clearDirtyBits(); } +} // namespace Qt3DCore + QT_END_NAMESPACE QT3D_REGISTER_NAMESPACED_ASPECT("core", QT_PREPEND_NAMESPACE(Qt3DCore), QCoreAspect) diff --git a/src/core/aspect/qcoresettings.cpp b/src/core/aspect/qcoresettings.cpp index 84aaa0df2..1bf3500aa 100644 --- a/src/core/aspect/qcoresettings.cpp +++ b/src/core/aspect/qcoresettings.cpp @@ -7,8 +7,6 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; - /*! \class Qt3DCore::QCoreSettings \brief The QCoreSettings class holds settings related to core data handling process. diff --git a/src/core/geometry/qbuffer.cpp b/src/core/geometry/qbuffer.cpp index 1d6bec562..595b5d2e9 100644 --- a/src/core/geometry/qbuffer.cpp +++ b/src/core/geometry/qbuffer.cpp @@ -7,8 +7,6 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; - namespace Qt3DCore { const char *QBufferPrivate::UpdateDataPropertyName = "QT3D_updateData"; diff --git a/src/core/geometry/qgeometry.cpp b/src/core/geometry/qgeometry.cpp index 05d791d7d..c280161b5 100644 --- a/src/core/geometry/qgeometry.cpp +++ b/src/core/geometry/qgeometry.cpp @@ -9,7 +9,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; +namespace Qt3DCore { QGeometryFactory::~QGeometryFactory() { @@ -238,6 +238,8 @@ QList<QAttribute *> QGeometry::attributes() const return d->m_attributes; } +} // namespace Qt3DCore + QT_END_NAMESPACE #include "moc_qgeometry.cpp" diff --git a/src/core/geometry/qgeometryview.cpp b/src/core/geometry/qgeometryview.cpp index e0e9dd75d..3f500ab30 100644 --- a/src/core/geometry/qgeometryview.cpp +++ b/src/core/geometry/qgeometryview.cpp @@ -12,7 +12,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; +namespace Qt3DCore { namespace { @@ -96,7 +96,6 @@ public: } - bool BoundingVolumeCalculator::apply(QAttribute *positionAttribute, QAttribute *indexAttribute, int drawVertexCount, @@ -578,6 +577,8 @@ void QGeometryView::setPrimitiveType(QGeometryView::PrimitiveType primitiveType) emit primitiveTypeChanged(primitiveType); } +} // namespace Qt3DCore + QT_END_NAMESPACE #include "moc_qgeometryview.cpp" |