diff options
author | Kai Koehne <kai.koehne@nokia.com> | 2011-11-17 10:47:36 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-21 09:43:11 +0100 |
commit | d7a5727d6942f77b2849ff27af472bc73f3b9dcb (patch) | |
tree | 95f53785ba4c9208756faf052b8d23aed84e2970 /src | |
parent | eeadfe200d71d778516b9dfb699046c005f8b6a0 (diff) |
Silence compiler warnings about unused variables (MSVC)
Fixes most 'C4189: local variable is initialized but not referenced' warnings
Change-Id: I8c5a1ba0a50dd3fcb22294e564425846362ee911
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/declarative/items/qquickitem.cpp | 7 | ||||
-rw-r--r-- | src/declarative/items/qquickshadereffectsource.cpp | 1 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativecomponent.cpp | 1 | ||||
-rw-r--r-- | src/declarative/scenegraph/util/qsgtexture.cpp | 4 | ||||
-rw-r--r-- | src/declarative/util/qdeclarativepath.cpp | 2 | ||||
-rw-r--r-- | src/imports/qt47/plugin.cpp | 1 | ||||
-rw-r--r-- | src/imports/qtquick1/plugin.cpp | 1 | ||||
-rw-r--r-- | src/qtquick1/graphicsitems/qdeclarativeitem.cpp | 7 |
8 files changed, 18 insertions, 6 deletions
diff --git a/src/declarative/items/qquickitem.cpp b/src/declarative/items/qquickitem.cpp index 91e6831ff7..294edad842 100644 --- a/src/declarative/items/qquickitem.cpp +++ b/src/declarative/items/qquickitem.cpp @@ -3212,9 +3212,10 @@ void QQuickItem::setState(const QString &state) QDeclarativeListProperty<QQuickTransform> QQuickItem::transform() { - Q_D(QQuickItem); - return QDeclarativeListProperty<QQuickTransform>(this, 0, d->transform_append, d->transform_count, - d->transform_at, d->transform_clear); + return QDeclarativeListProperty<QQuickTransform>(this, 0, QQuickItemPrivate::transform_append, + QQuickItemPrivate::transform_count, + QQuickItemPrivate::transform_at, + QQuickItemPrivate::transform_clear); } void QQuickItem::classBegin() diff --git a/src/declarative/items/qquickshadereffectsource.cpp b/src/declarative/items/qquickshadereffectsource.cpp index e0aa9ed7b1..952f240cd3 100644 --- a/src/declarative/items/qquickshadereffectsource.cpp +++ b/src/declarative/items/qquickshadereffectsource.cpp @@ -586,6 +586,7 @@ QQuickItem *QQuickShaderEffectSource::sourceItem() const void QQuickShaderEffectSource::itemGeometryChanged(QQuickItem *item, const QRectF &newRect, const QRectF &oldRect) { Q_ASSERT(item == m_sourceItem); + Q_UNUSED(item); if (newRect.size() != oldRect.size()) update(); } diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp index b95c75f91b..3231bb9503 100644 --- a/src/declarative/qml/qdeclarativecomponent.cpp +++ b/src/declarative/qml/qdeclarativecomponent.cpp @@ -1107,6 +1107,7 @@ void QDeclarativeComponent::incubateObject(QDeclarativeV8Function *args) { Q_D(QDeclarativeComponent); Q_ASSERT(d->engine); + Q_UNUSED(d); Q_ASSERT(args); QObject *parent = 0; diff --git a/src/declarative/scenegraph/util/qsgtexture.cpp b/src/declarative/scenegraph/util/qsgtexture.cpp index 7cd398d9e0..2d3e7cdd3c 100644 --- a/src/declarative/scenegraph/util/qsgtexture.cpp +++ b/src/declarative/scenegraph/util/qsgtexture.cpp @@ -129,6 +129,8 @@ inline static void qt_debug_add_texture(QSGTexture* texture) item->backTraceSize = backtrace(item->backTrace, BACKTRACE_SIZE); qt_debug_allocated_textures.insert(texture, item); } +#else + Q_UNUSED(texture); #endif // Q_OS_LINUX ++qt_debug_texture_count; @@ -150,6 +152,8 @@ static void qt_debug_remove_texture(QSGTexture* texture) delete item; } } +#else + Q_UNUSED(texture) #endif --qt_debug_texture_count; diff --git a/src/declarative/util/qdeclarativepath.cpp b/src/declarative/util/qdeclarativepath.cpp index bf3b46ee81..2ba7c372e2 100644 --- a/src/declarative/util/qdeclarativepath.cpp +++ b/src/declarative/util/qdeclarativepath.cpp @@ -552,6 +552,7 @@ QPointF QDeclarativePath::forwardsPointAt(const QPainterPath &path, const qreal while (spc > epc) { Q_ASSERT(!(currElement > lastElement)); + Q_UNUSED(lastElement); currBez = nextBezier(path, &currElement, &bezLength); currLength += bezLength; epc = currLength / pathLength; @@ -606,6 +607,7 @@ QPointF QDeclarativePath::backwardsPointAt(const QPainterPath &path, const qreal while (spc < epc) { Q_ASSERT(!(currElement < firstElement)); + Q_UNUSED(firstElement); currBez = nextBezier(path, &currElement, &bezLength, true /*reverse*/); currLength = prevLength; prevLength = currLength - bezLength; diff --git a/src/imports/qt47/plugin.cpp b/src/imports/qt47/plugin.cpp index dd086638de..405baedd57 100644 --- a/src/imports/qt47/plugin.cpp +++ b/src/imports/qt47/plugin.cpp @@ -53,6 +53,7 @@ public: virtual void registerTypes(const char *uri) { Q_ASSERT(QLatin1String(uri) == QLatin1String("Qt")); + Q_UNUSED(uri); QDeclarativeQtQuick1Module::defineModule(QDeclarativeQtQuick1Module::Qt47); } }; diff --git a/src/imports/qtquick1/plugin.cpp b/src/imports/qtquick1/plugin.cpp index 522f2ec796..c543626087 100644 --- a/src/imports/qtquick1/plugin.cpp +++ b/src/imports/qtquick1/plugin.cpp @@ -53,6 +53,7 @@ public: virtual void registerTypes(const char *uri) { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick")); + Q_UNUSED(uri); QDeclarativeQtQuick1Module::defineModule(QDeclarativeQtQuick1Module::QtQuick1); } }; diff --git a/src/qtquick1/graphicsitems/qdeclarativeitem.cpp b/src/qtquick1/graphicsitems/qdeclarativeitem.cpp index c719067e2e..bd795cb4b5 100644 --- a/src/qtquick1/graphicsitems/qdeclarativeitem.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativeitem.cpp @@ -2950,9 +2950,10 @@ void QDeclarativeItemPrivate::setState(const QString &state) /*! \internal */ QDeclarativeListProperty<QGraphicsTransform> QDeclarativeItem::transform() { - Q_D(QDeclarativeItem); - return QDeclarativeListProperty<QGraphicsTransform>(this, 0, d->transform_append, d->transform_count, - d->transform_at, d->transform_clear); + return QDeclarativeListProperty<QGraphicsTransform>(this, 0, QDeclarativeItemPrivate::transform_append, + QDeclarativeItemPrivate::transform_count, + QDeclarativeItemPrivate::transform_at, + QDeclarativeItemPrivate::transform_clear); } /*! |