diff options
Diffstat (limited to 'src/core/aspects')
| -rw-r--r-- | src/core/aspects/aspectcommanddebugger.cpp | 12 | ||||
| -rw-r--r-- | src/core/aspects/aspects.pri | 20 | ||||
| -rw-r--r-- | src/core/aspects/qabstractaspect.cpp | 2 | ||||
| -rw-r--r-- | src/core/aspects/qaspectmanager.cpp | 17 |
4 files changed, 14 insertions, 37 deletions
diff --git a/src/core/aspects/aspectcommanddebugger.cpp b/src/core/aspects/aspectcommanddebugger.cpp index d2d19d011..e6c9d7232 100644 --- a/src/core/aspects/aspectcommanddebugger.cpp +++ b/src/core/aspects/aspectcommanddebugger.cpp @@ -37,9 +37,9 @@ void AspectCommandDebugger::ReadBuffer::insert(const QByteArray &array) void AspectCommandDebugger::ReadBuffer::trim() { if (startIdx != endIdx && startIdx != 0) { - memcpy(buffer.data(), - buffer.constData() + startIdx, - size()); + memmove(buffer.data(), + buffer.constData() + startIdx, + size()); endIdx -= startIdx; startIdx = 0; } @@ -53,17 +53,17 @@ AspectCommandDebugger::AspectCommandDebugger(QSystemInformationService *parent) void AspectCommandDebugger::initialize() { - QObject::connect(this, &QTcpServer::newConnection, [this] { + QObject::connect(this, &QTcpServer::newConnection, this, [this] { QTcpSocket *socket = nextPendingConnection(); m_connections.push_back(socket); - QObject::connect(socket, &QTcpSocket::disconnected, [this, socket] { + QObject::connect(socket, &QTcpSocket::disconnected, this, [this, socket] { m_connections.removeOne(socket); // Destroy object to make sure all QObject connection are removed socket->deleteLater(); }); - QObject::connect(socket, &QTcpSocket::readyRead, [this, socket] { + QObject::connect(socket, &QTcpSocket::readyRead, this, [this, socket] { onCommandReceived(socket); }); }); diff --git a/src/core/aspects/aspects.pri b/src/core/aspects/aspects.pri deleted file mode 100644 index 268a2fc37..000000000 --- a/src/core/aspects/aspects.pri +++ /dev/null @@ -1,20 +0,0 @@ -SOURCES += \ - $$PWD/qabstractaspect.cpp \ - $$PWD/qaspectengine.cpp \ - $$PWD/qaspectfactory.cpp \ - $$PWD/qaspectmanager.cpp \ - $$PWD/aspectcommanddebugger.cpp - -HEADERS += \ - $$PWD/qabstractaspect.h \ - $$PWD/qaspectengine.h \ - $$PWD/qabstractaspect_p.h \ - $$PWD/qaspectengine_p.h \ - $$PWD/qaspectfactory_p.h \ - $$PWD/qaspectmanager_p.h \ - $$PWD/aspectcommanddebugger_p.h - -INCLUDEPATH += $$PWD - -include($$QT3D_BUILD_ROOT/src/core/qt3dcore-config.pri) -QT_FOR_CONFIG += 3dcore-private diff --git a/src/core/aspects/qabstractaspect.cpp b/src/core/aspects/qabstractaspect.cpp index 67cbc2f80..8ba5abd63 100644 --- a/src/core/aspects/qabstractaspect.cpp +++ b/src/core/aspects/qabstractaspect.cpp @@ -65,7 +65,7 @@ void QAbstractAspectPrivate::unregisterBackendType(const QMetaObject &mo) */ /*! - * \fn void Qt3DCore::QAbstractAspect::registerBackendType(const Qt3DCore::QBackendNodeMapperPtr &functor) + * \fn template <class Frontend> void Qt3DCore::QAbstractAspect::registerBackendType(const Qt3DCore::QBackendNodeMapperPtr &functor) * Registers backend with \a functor. */ diff --git a/src/core/aspects/qaspectmanager.cpp b/src/core/aspects/qaspectmanager.cpp index 2b99d972a..199d293ed 100644 --- a/src/core/aspects/qaspectmanager.cpp +++ b/src/core/aspects/qaspectmanager.cpp @@ -273,17 +273,14 @@ void QAspectManager::addNodes(const QList<QNode *> &nodes) // as this call) The idea is we want to avoid modifying the backend tree if // the Renderer hasn't allowed processFrame to continue yet - QList<NodeTreeChange> treeChanges; - treeChanges.reserve(nodes.size()); + m_nodeTreeChanges.reserve(m_nodeTreeChanges.size() + nodes.size()); for (QNode *node : nodes) { - treeChanges.push_back({ node->id(), - QNodePrivate::get(node)->m_typeInfo, - NodeTreeChange::Added, - node }); + m_nodeTreeChanges.push_back({ node->id(), + QNodePrivate::get(node)->m_typeInfo, + NodeTreeChange::Added, + node }); } - - m_nodeTreeChanges += treeChanges; } // Main Thread -> immediately following node destruction (call from QNode dtor) @@ -512,13 +509,13 @@ void QAspectManager::processFrame() // Sync node / subnode relationship changes const auto dirtySubNodes = m_changeArbiter->takeDirtyEntityComponentNodes(); - if (dirtySubNodes.size()) + if (!dirtySubNodes.empty()) for (QAbstractAspect *aspect : std::as_const(m_aspects)) QAbstractAspectPrivate::get(aspect)->syncDirtyEntityComponentNodes(dirtySubNodes); // Sync property updates const auto dirtyFrontEndNodes = m_changeArbiter->takeDirtyFrontEndNodes(); - if (dirtyFrontEndNodes.size()) + if (!dirtyFrontEndNodes.empty()) for (QAbstractAspect *aspect : std::as_const(m_aspects)) QAbstractAspectPrivate::get(aspect)->syncDirtyFrontEndNodes(dirtyFrontEndNodes); } |