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>
sailfishos · Nov 21, 2011 · d7a5727 · d7a5727
1 parent eeadfe2
commit d7a5727
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -53,6 +53,7 @@ class Qt47Plugin : public QDeclarativeExtensionPlugin
     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
@@ -53,6 +53,7 @@ class QtQuick1Plugin : public QDeclarativeExtensionPlugin
     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
@@ -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);
 }
 
 /*!