summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2018-04-12 11:18:09 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2018-04-12 09:35:45 +0000
commit3d58bebb3227764c24ef06b79e85bf4b43021eff (patch)
treea5a4bb3c65482f3c20c04db03ef3a9870b532611
parent8a2c3867ef50c4856f4151c395ba71ffd8cdf768 (diff)
Remove unused variables detected by clang-cl
nodes\qnode.cpp(391,34): warning: lambda capture 'this' is not used [-Wunused-lambda-capture] backend\gltfimporter.cpp(345,19): warning: unused variable 's' [-Wunused-variable] backend\gltfimporter.cpp(353,19): warning: unused variable 't' [-Wunused-variable] text\qdistancefieldglyphcache.cpp(79,13): warning: private field 'm_glyph' is not used [-Wunused-private-field] Change-Id: Id546607d95561efa7547fb5d7df0b03184bc5ed7 Reviewed-by: Mike Krus <mike.krus@kdab.com>
-rw-r--r--src/core/nodes/qnode.cpp2
-rw-r--r--src/extras/text/qdistancefieldglyphcache.cpp4
-rw-r--r--src/render/geometry/gltfskeletonloader.cpp3
3 files changed, 2 insertions, 7 deletions
diff --git a/src/core/nodes/qnode.cpp b/src/core/nodes/qnode.cpp
index 316608c63..ecdc83b2c 100644
--- a/src/core/nodes/qnode.cpp
+++ b/src/core/nodes/qnode.cpp
@@ -388,7 +388,7 @@ void QNodePrivate::propertyChanged(int propertyIndex)
if (m_blockNotifications)
return;
- const auto toBackendValue = [this](const QVariant &data) -> QVariant
+ const auto toBackendValue = [](const QVariant &data) -> QVariant
{
if (data.canConvert<QNode*>()) {
QNode *node = data.value<QNode*>();
diff --git a/src/extras/text/qdistancefieldglyphcache.cpp b/src/extras/text/qdistancefieldglyphcache.cpp
index 99085f378..30db3ff4e 100644
--- a/src/extras/text/qdistancefieldglyphcache.cpp
+++ b/src/extras/text/qdistancefieldglyphcache.cpp
@@ -76,7 +76,6 @@ public:
QRectF texCoords() const;
private:
- quint32 m_glyph = (quint32) -1;
quint32 m_ref = 0;
QTextureAtlas *m_atlas = nullptr;
QTextureAtlas::TextureId m_atlasEntry = QTextureAtlas::InvalidTexture;
@@ -111,8 +110,7 @@ private:
};
StoredGlyph::StoredGlyph(const QRawFont &font, quint32 glyph, bool doubleResolution)
- : m_glyph(glyph)
- , m_ref(1)
+ : m_ref(1)
, m_atlas(nullptr)
, m_atlasEntry(QTextureAtlas::InvalidTexture)
{
diff --git a/src/render/geometry/gltfskeletonloader.cpp b/src/render/geometry/gltfskeletonloader.cpp
index b4e33babb..56144747c 100644
--- a/src/render/geometry/gltfskeletonloader.cpp
+++ b/src/render/geometry/gltfskeletonloader.cpp
@@ -224,15 +224,12 @@ GLTFSkeletonLoader::Node::Node(const QJsonObject &json)
const auto rotationValue = json.value(KEY_ROTATION);
const auto translationValue = json.value(KEY_TRANSLATION);
- QVector3D s(1.0f, 1.0f, 1.0f);
if (!scaleValue.isUndefined())
jsonArrayToVector3D(scaleValue.toArray(), localTransform.scale);
- QQuaternion r;
if (!rotationValue.isUndefined())
jsonArrayToQuaternion(json.value(KEY_ROTATION).toArray(), localTransform.rotation);
- QVector3D t;
if (!translationValue.isUndefined())
jsonArrayToVector3D(json.value(KEY_TRANSLATION).toArray(), localTransform.translation);
}