diff options
author | Mike Krus <mike.krus@kdab.com> | 2019-12-03 15:05:59 +0000 |
---|---|---|
committer | Mike Krus <mike.krus@kdab.com> | 2019-12-06 10:54:26 +0000 |
commit | 3d1063fce2ada72d740f5f7c7888533da8794753 (patch) | |
tree | fe4e837f7ff77f3cb0a1114a637722362bd911a1 /src/core | |
parent | 9f3ebe697d09dca60fb870f128e26623f9f2a931 (diff) |
Make NodeRelationshipChange struct private
Was private in 5.14, should remain so in 5.15
Change-Id: I74231d349e60f498d8ffb4ff39cc1e95fa3f0567
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/aspects/qabstractaspect.cpp | 16 | ||||
-rw-r--r-- | src/core/aspects/qabstractaspect.h | 3 | ||||
-rw-r--r-- | src/core/aspects/qabstractaspect_p.h | 1 | ||||
-rw-r--r-- | src/core/aspects/qaspectmanager.cpp | 4 | ||||
-rw-r--r-- | src/core/changes/qscenechange.h | 8 | ||||
-rw-r--r-- | src/core/changes/qscenechange_p.h | 7 | ||||
-rw-r--r-- | src/core/qchangearbiter_p.h | 1 |
7 files changed, 13 insertions, 27 deletions
diff --git a/src/core/aspects/qabstractaspect.cpp b/src/core/aspects/qabstractaspect.cpp index e2bb4c9c7..7e184c06d 100644 --- a/src/core/aspects/qabstractaspect.cpp +++ b/src/core/aspects/qabstractaspect.cpp @@ -198,28 +198,16 @@ void QAbstractAspect::unregisterBackendType(const QMetaObject &obj) QVariant QAbstractAspect::executeCommand(const QStringList &args) { - Q_UNUSED(args); + Q_UNUSED(args) return QVariant(); } QVector<QAspectJobPtr> QAbstractAspect::jobsToExecute(qint64 time) { - Q_UNUSED(time); + Q_UNUSED(time) return QVector<QAspectJobPtr>(); } -void QAbstractAspect::syncDirtyFrontEndNodes(const QVector<QNode *> &nodes) -{ - Q_D(QAbstractAspect); - d->syncDirtyFrontEndNodes(nodes); -} - -void QAbstractAspect::syncDirtyFrontEndSubNodes(const QVector<NodeRelationshipChange> &nodes) -{ - Q_D(QAbstractAspect); - d->syncDirtyFrontEndSubNodes(nodes); -} - QAbstractAspectPrivate::BackendNodeMapperAndInfo QAbstractAspectPrivate::mapperForNode(const QMetaObject *metaObj) const { Q_ASSERT(metaObj); diff --git a/src/core/aspects/qabstractaspect.h b/src/core/aspects/qabstractaspect.h index 8059421a6..3b2f31c50 100644 --- a/src/core/aspects/qabstractaspect.h +++ b/src/core/aspects/qabstractaspect.h @@ -87,9 +87,6 @@ protected: void unregisterBackendType(const QMetaObject &); private: - void syncDirtyFrontEndNodes(const QVector<QNode *> &nodes); - void syncDirtyFrontEndSubNodes(const QVector<NodeRelationshipChange> &nodes); - virtual QVariant executeCommand(const QStringList &args); virtual QVector<QAspectJobPtr> jobsToExecute(qint64 time); diff --git a/src/core/aspects/qabstractaspect_p.h b/src/core/aspects/qabstractaspect_p.h index b8ef5dbb6..025583bef 100644 --- a/src/core/aspects/qabstractaspect_p.h +++ b/src/core/aspects/qabstractaspect_p.h @@ -57,6 +57,7 @@ #include <Qt3DCore/private/qaspectjobproviderinterface_p.h> #include <Qt3DCore/private/qbackendnode_p.h> #include <Qt3DCore/private/qt3dcore_global_p.h> +#include <Qt3DCore/private/qscenechange_p.h> #include <QtCore/private/qobject_p.h> #include <QMutex> diff --git a/src/core/aspects/qaspectmanager.cpp b/src/core/aspects/qaspectmanager.cpp index 5c83e0799..f24248399 100644 --- a/src/core/aspects/qaspectmanager.cpp +++ b/src/core/aspects/qaspectmanager.cpp @@ -484,13 +484,13 @@ void QAspectManager::processFrame() const auto dirtySubNodes = m_changeArbiter->takeDirtyFrontEndSubNodes(); if (dirtySubNodes.size()) for (QAbstractAspect *aspect : qAsConst(m_aspects)) - aspect->syncDirtyFrontEndSubNodes(dirtySubNodes); + QAbstractAspectPrivate::get(aspect)->syncDirtyFrontEndSubNodes(dirtySubNodes); // Sync property updates const auto dirtyFrontEndNodes = m_changeArbiter->takeDirtyFrontEndNodes(); if (dirtyFrontEndNodes.size()) for (QAbstractAspect *aspect : qAsConst(m_aspects)) - aspect->syncDirtyFrontEndNodes(dirtyFrontEndNodes); + QAbstractAspectPrivate::get(aspect)->syncDirtyFrontEndNodes(dirtyFrontEndNodes); // TO DO: Having this done in the main thread actually means aspects could just // as simply read info out of the Frontend classes without risk of introducing diff --git a/src/core/changes/qscenechange.h b/src/core/changes/qscenechange.h index e8c0ea748..4a0740819 100644 --- a/src/core/changes/qscenechange.h +++ b/src/core/changes/qscenechange.h @@ -64,14 +64,6 @@ Q_DECLARE_FLAGS(ChangeFlags, ChangeFlag) Q_DECLARE_OPERATORS_FOR_FLAGS(ChangeFlags) class QNode; -//! internal -struct NodeRelationshipChange { - QNode *node; - QNode *subNode; - ChangeFlag change; - const char *property; -}; - class QSceneChangePrivate; class Q_3DCORESHARED_EXPORT QSceneChange diff --git a/src/core/changes/qscenechange_p.h b/src/core/changes/qscenechange_p.h index d32f6eec3..32006807c 100644 --- a/src/core/changes/qscenechange_p.h +++ b/src/core/changes/qscenechange_p.h @@ -63,6 +63,13 @@ namespace Qt3DCore { class QSceneChange; class QNodeId; +struct NodeRelationshipChange { + QNode *node; + QNode *subNode; + ChangeFlag change; + const char *property; +}; + class Q_3DCORE_PRIVATE_EXPORT QSceneChangePrivate { public : diff --git a/src/core/qchangearbiter_p.h b/src/core/qchangearbiter_p.h index f31480685..7d48c390a 100644 --- a/src/core/qchangearbiter_p.h +++ b/src/core/qchangearbiter_p.h @@ -64,6 +64,7 @@ #include <Qt3DCore/private/qlockableobserverinterface_p.h> #include <Qt3DCore/private/qt3dcore_global_p.h> +#include <Qt3DCore/private/qscenechange_p.h> QT_BEGIN_NAMESPACE |