mirror of https://github.com/qt/qtgraphs.git
3D: Remove unused mutex variables
These mutexes were leftovers from datavis3d. Pick-to: 6.10 6.9 6.8 Change-Id: Ic576ef945068a9d546babc00c05566cb0e0cc490 Reviewed-by: Sakaria Pouke <sakaria.pouke@qt.io> Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
This commit is contained in:
parent
fa271ab207
commit
a70f70c9d3
|
|
@ -13,7 +13,6 @@
|
|||
#include "qgraphs3dlogging_p.h"
|
||||
|
||||
#include <QColor>
|
||||
#include <QtCore/QMutexLocker>
|
||||
#include <QtQuick3D/private/qquick3dcustommaterial_p.h>
|
||||
#include <QtQuick3D/private/qquick3dprincipledmaterial_p.h>
|
||||
#include <QtQuick3D/private/qquick3drepeater_p.h>
|
||||
|
|
@ -313,8 +312,6 @@ QQuickGraphsBars::QQuickGraphsBars(QQuickItem *parent)
|
|||
|
||||
QQuickGraphsBars::~QQuickGraphsBars()
|
||||
{
|
||||
QMutexLocker locker(m_nodeMutex.data());
|
||||
const QMutexLocker locker2(mutex());
|
||||
removeBarModels();
|
||||
removeSlicedBarModels();
|
||||
if (m_grabresult)
|
||||
|
|
|
|||
|
|
@ -829,8 +829,6 @@ QQuickGraphsItem::QQuickGraphsItem(QQuickItem *parent)
|
|||
this,
|
||||
&QQuickGraphsItem::handleSecondarySubViewportChanged);
|
||||
|
||||
m_nodeMutex = QSharedPointer<QMutex>::create();
|
||||
|
||||
QQuick3DSceneEnvironment *scene = environment();
|
||||
scene->setBackgroundMode(QQuick3DSceneEnvironment::QQuick3DEnvironmentBackgroundTypes::Color);
|
||||
scene->setClearColor(Qt::transparent);
|
||||
|
|
@ -875,12 +873,6 @@ QQuickGraphsItem::~QQuickGraphsItem()
|
|||
delete m_gridGeometryModel;
|
||||
delete m_subgridGeometryModel;
|
||||
delete m_sliceGridGeometryModel;
|
||||
|
||||
// Make sure not deleting locked mutex
|
||||
QMutexLocker locker(&m_mutex);
|
||||
locker.unlock();
|
||||
|
||||
m_nodeMutex.clear();
|
||||
}
|
||||
|
||||
void QQuickGraphsItem::handleAxisTitleChanged(const QString &title)
|
||||
|
|
@ -5555,7 +5547,6 @@ void QQuickGraphsItem::itemChange(ItemChange change, const ItemChangeData &value
|
|||
|
||||
void QQuickGraphsItem::updateWindowParameters()
|
||||
{
|
||||
const QMutexLocker locker(&m_mutex);
|
||||
// Update the device pixel ratio, window size and bounding box
|
||||
QQuickWindow *win = window();
|
||||
if (win) {
|
||||
|
|
|
|||
|
|
@ -399,8 +399,6 @@ public:
|
|||
void setMargin(qreal margin);
|
||||
qreal margin() const;
|
||||
|
||||
QMutex *mutex() { return &m_mutex; }
|
||||
|
||||
bool isReady() { return isComponentComplete(); }
|
||||
QQuick3DNode *rootNode() const;
|
||||
|
||||
|
|
@ -779,8 +777,6 @@ protected:
|
|||
QAbstract3DAxis **axisPtr);
|
||||
virtual void startRecordingRemovesAndInserts();
|
||||
|
||||
QSharedPointer<QMutex> m_nodeMutex;
|
||||
|
||||
QMap<QCustom3DVolume *, Volume> m_customVolumes;
|
||||
|
||||
Q3DScene *m_scene = nullptr;
|
||||
|
|
@ -811,7 +807,6 @@ protected:
|
|||
qsizetype m_selectedCustomItemIndex = -1;
|
||||
qreal m_margin = -1.0;
|
||||
|
||||
QMutex m_renderMutex;
|
||||
QQuickGraphsItem *m_qml = nullptr;
|
||||
|
||||
QQuick3DViewport *m_customView = nullptr;
|
||||
|
|
@ -877,7 +872,6 @@ private:
|
|||
int m_windowSamples = 0;
|
||||
QSize m_initialisedSize = QSize(0, 0);
|
||||
bool m_runningInDesigner;
|
||||
QMutex m_mutex;
|
||||
|
||||
bool m_xFlipped = false;
|
||||
bool m_yFlipped = false;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@
|
|||
#include "qgraphs3dlogging_p.h"
|
||||
|
||||
#include <QColor>
|
||||
#include <QtCore/QMutexLocker>
|
||||
#include <QtQuick3D/private/qquick3dcustommaterial_p.h>
|
||||
#include <QtQuick3D/private/qquick3ddirectionallight_p.h>
|
||||
#include <QtQuick3D/private/qquick3dmodel_p.h>
|
||||
|
|
@ -186,9 +185,6 @@ QQuickGraphsScatter::QQuickGraphsScatter(QQuickItem *parent)
|
|||
|
||||
QQuickGraphsScatter::~QQuickGraphsScatter()
|
||||
{
|
||||
QMutexLocker locker(m_nodeMutex.data());
|
||||
const QMutexLocker locker2(mutex());
|
||||
|
||||
for (auto &graphModel : m_scatterGraphs) {
|
||||
delete graphModel;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
// Copyright (C) 2023 The Qt Company Ltd.
|
||||
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
|
||||
|
||||
#include <QtCore/QMutexLocker>
|
||||
#include "private/qquick3drepeater_p.h"
|
||||
#include "q3dscene.h"
|
||||
#include "qabstractdataproxy.h"
|
||||
|
|
@ -218,8 +217,6 @@ QQuickGraphsSurface::QQuickGraphsSurface(QQuickItem *parent)
|
|||
|
||||
QQuickGraphsSurface::~QQuickGraphsSurface()
|
||||
{
|
||||
QMutexLocker locker(m_nodeMutex.data());
|
||||
const QMutexLocker locker2(mutex());
|
||||
for (const auto &model : std::as_const(m_model))
|
||||
delete model;
|
||||
if (m_grabresult)
|
||||
|
|
|
|||
Loading…
Reference in New Issue