diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2017-07-21 12:01:15 +0200 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-07-22 10:20:12 +0000 |
commit | 2a0327d15d9c3fe2201bb47f0117b8385d86fd67 (patch) | |
tree | 90281c866191337c344a49afcde93cde70e621ec /src | |
parent | 008b3906bd28b235e3f0fb6a7429513df7b9cdc0 (diff) |
Use QSharedPointer::create() more
This is the result of running the (experimental) clang-tidy check
qt-modernize-qsharedpointer-create
Discarded changes: none.
Change-Id: Ic6368521ebf5841267ffe7917cc652627f7b26a7
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/animation/backend/handler.cpp | 4 | ||||
-rw-r--r-- | src/input/backend/keyeventdispatcherjob.cpp | 2 | ||||
-rw-r--r-- | src/input/backend/mouseeventdispatcherjob.cpp | 4 | ||||
-rw-r--r-- | src/render/backend/entity.cpp | 6 | ||||
-rw-r--r-- | src/render/jobs/pickboundingvolumejob.cpp | 8 | ||||
-rw-r--r-- | src/render/texture/qpaintedtextureimage.cpp | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/src/animation/backend/handler.cpp b/src/animation/backend/handler.cpp index 33bc8c9f4..406ac950b 100644 --- a/src/animation/backend/handler.cpp +++ b/src/animation/backend/handler.cpp @@ -216,7 +216,7 @@ QVector<Qt3DCore::QAspectJobPtr> Handler::jobsToExecute(qint64 time) if (oldSize < newSize) { m_evaluateClipAnimatorJobs.resize(newSize); for (int i = oldSize; i < newSize; ++i) { - m_evaluateClipAnimatorJobs[i].reset(new EvaluateClipAnimatorJob()); + m_evaluateClipAnimatorJobs[i] = QSharedPointer<EvaluateClipAnimatorJob>::create(); m_evaluateClipAnimatorJobs[i]->setHandler(this); } } @@ -242,7 +242,7 @@ QVector<Qt3DCore::QAspectJobPtr> Handler::jobsToExecute(qint64 time) if (oldSize < newSize) { m_evaluateBlendClipAnimatorJobs.resize(newSize); for (int i = oldSize; i < newSize; ++i) { - m_evaluateBlendClipAnimatorJobs[i].reset(new EvaluateBlendClipAnimatorJob()); + m_evaluateBlendClipAnimatorJobs[i] = QSharedPointer<EvaluateBlendClipAnimatorJob>::create(); m_evaluateBlendClipAnimatorJobs[i]->setHandler(this); } } diff --git a/src/input/backend/keyeventdispatcherjob.cpp b/src/input/backend/keyeventdispatcherjob.cpp index ac90e9e37..6201453fc 100644 --- a/src/input/backend/keyeventdispatcherjob.cpp +++ b/src/input/backend/keyeventdispatcherjob.cpp @@ -69,7 +69,7 @@ void KeyEventDispatcherJob::run() if (input) for (const QT_PREPEND_NAMESPACE(QKeyEvent) &e : qAsConst(m_events)) { // Send events to frontend - input->keyEvent(QKeyEventPtr(new QKeyEvent(e))); + input->keyEvent(QKeyEventPtr::create(e)); } } diff --git a/src/input/backend/mouseeventdispatcherjob.cpp b/src/input/backend/mouseeventdispatcherjob.cpp index 11653d8a8..4bd3e93c3 100644 --- a/src/input/backend/mouseeventdispatcherjob.cpp +++ b/src/input/backend/mouseeventdispatcherjob.cpp @@ -77,10 +77,10 @@ void MouseEventDispatcherJob::run() if (input) { // Send mouse and wheel events to frontend for (const QT_PREPEND_NAMESPACE(QMouseEvent) &e : m_mouseEvents) - input->mouseEvent(QMouseEventPtr(new QMouseEvent(e))); + input->mouseEvent(QMouseEventPtr::create(e)); #if QT_CONFIG(wheelevent) for (const QT_PREPEND_NAMESPACE(QWheelEvent) &e : m_wheelEvents) - input->wheelEvent(QWheelEventPtr(new QWheelEvent(e))); + input->wheelEvent(QWheelEventPtr::create(e)); #endif } } diff --git a/src/render/backend/entity.cpp b/src/render/backend/entity.cpp index 898c1e36e..a32edab5c 100644 --- a/src/render/backend/entity.cpp +++ b/src/render/backend/entity.cpp @@ -177,9 +177,9 @@ void Entity::initializeFromPeer(const QNodeCreatedChangeBasePtr &change) m_shaderDataComponents.clear(); m_lightComponents.clear(); m_environmentLightComponents.clear(); - m_localBoundingVolume.reset(new Sphere(peerId())); - m_worldBoundingVolume.reset(new Sphere(peerId())); - m_worldBoundingVolumeWithChildren.reset(new Sphere(peerId())); + m_localBoundingVolume = QSharedPointer<Sphere>::create(peerId()); + m_worldBoundingVolume = QSharedPointer<Sphere>::create(peerId()); + m_worldBoundingVolumeWithChildren = QSharedPointer<Sphere>::create(peerId()); for (const auto &idAndType : qAsConst(data.componentIdsAndTypes)) addComponent(idAndType); diff --git a/src/render/jobs/pickboundingvolumejob.cpp b/src/render/jobs/pickboundingvolumejob.cpp index 11149bd39..19c9932f5 100644 --- a/src/render/jobs/pickboundingvolumejob.cpp +++ b/src/render/jobs/pickboundingvolumejob.cpp @@ -344,13 +344,13 @@ void PickBoundingVolumeJob::dispatchPickEvents(const QMouseEvent &event, QPickEventPtr pickEvent; if (trianglePickingRequested) { - pickEvent.reset(new QPickTriangleEvent(event.localPos(), hit.m_intersection, localIntersection, hit.m_distance, + pickEvent = QSharedPointer<QPickTriangleEvent>::create(event.localPos(), hit.m_intersection, localIntersection, hit.m_distance, hit.m_triangleIndex, hit.m_vertexIndex[0], hit.m_vertexIndex[1], hit.m_vertexIndex[2], - eventButton, eventButtons, eventModifiers, hit.m_uvw)); + eventButton, eventButtons, eventModifiers, hit.m_uvw); QPickEventPrivate::get(pickEvent.data())->m_entity = hit.m_entityId; } else { - pickEvent.reset(new QPickEvent(event.localPos(), hit.m_intersection, localIntersection, hit.m_distance, - eventButton, eventButtons, eventModifiers)); + pickEvent = QSharedPointer<QPickEvent>::create(event.localPos(), hit.m_intersection, localIntersection, hit.m_distance, + eventButton, eventButtons, eventModifiers); } switch (event.type()) { case QEvent::MouseButtonPress: { diff --git a/src/render/texture/qpaintedtextureimage.cpp b/src/render/texture/qpaintedtextureimage.cpp index 4d03eb809..db03b26b9 100644 --- a/src/render/texture/qpaintedtextureimage.cpp +++ b/src/render/texture/qpaintedtextureimage.cpp @@ -88,7 +88,7 @@ void QPaintedTextureImagePrivate::repaint() painter.end(); ++m_generation; - m_currentGenerator.reset(new QPaintedTextureImageDataGenerator(*m_image.data(), m_generation, q_func()->id())); + m_currentGenerator = QSharedPointer<QPaintedTextureImageDataGenerator>::create(*m_image.data(), m_generation, q_func()->id()); q_func()->notifyDataGeneratorChanged(); } |