Fixes for compiler warnings reported by RVCT

Task-number: 241223
Reviewed-by: Janne Koskinen

5 files changed, 11 insertions, 28 deletions

diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 263e53e..90d79d7 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -7556,7 +7556,6 @@ start_lengthVariant:
     bool hasMoreLengthVariants = false;
     // compatible behaviour to the old implementation. Replace
     // tabs by spaces
-    bool has_tab = false;
     int old_offset = offset;
     for (; offset < text.length(); offset++) {
         QChar chr = text.at(offset);
@@ -7572,7 +7571,6 @@ start_lengthVariant:
             } else if (!tabarraylen && !tabstops) {
                 tabstops = qRound(fm.width(QLatin1Char('x'))*8);
             }
-            has_tab = true;
         } else if (chr == QChar(ushort(0x9c))) {
             // string with multiple length variants
             hasMoreLengthVariants = true;
diff --git a/src/gui/styles/qs60style_s60.cpp b/src/gui/styles/qs60style_s60.cpp
index c524844..6418941 100644
--- a/src/gui/styles/qs60style_s60.cpp
+++ b/src/gui/styles/qs60style_s60.cpp
@@ -117,7 +117,7 @@ private:
     static void checkAndUnCompressBitmap(CFbsBitmap*& aOriginalBitmap);
     static void unCompressBitmapL(const TRect& aTrgRect, CFbsBitmap* aTrgBitmap, CFbsBitmap* aSrcBitmap);
     static void colorGroupAndIndex(QS60StyleEnums::SkinParts skinID,
-        TAknsItemID &colorGroup, int colorIndex);
+        TAknsItemID &colorGroup, int &colorIndex);
     static void fallbackInfo(const QS60StyleEnums::SkinParts &stylepart, TDes& fallbackFileName, TInt& fallbackIndex);
     static bool checkSupport(const int supportedRelease);
     static TAknsItemID checkAndUpdateReleaseSpecificGraphics(int part);
@@ -1331,7 +1331,7 @@ QSize QS60StylePrivate::screenSize()
 }
 
 void QS60StyleModeSpecifics::colorGroupAndIndex(
-    QS60StyleEnums::SkinParts skinID, TAknsItemID &colorGroup, int colorIndex)
+    QS60StyleEnums::SkinParts skinID, TAknsItemID &colorGroup, int &colorIndex)
 {
     switch(skinID) {
         case QS60StyleEnums::SP_QgnIndiSubMenu:
diff --git a/src/gui/styles/qwindowsstyle.cpp b/src/gui/styles/qwindowsstyle.cpp
index 2a88578..bc5cb83 100644
--- a/src/gui/styles/qwindowsstyle.cpp
+++ b/src/gui/styles/qwindowsstyle.cpp
@@ -1770,8 +1770,6 @@ case PE_FrameDockWidget:
 #endif // QT_NO_PROGRESSBAR
 
     case PE_FrameTabWidget: {
-        QRect rect = opt->rect;
-        QPalette pal = opt->palette;
         qDrawWinButton(p, opt->rect, opt->palette, false, 0);
         break;
     }
diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
index 35b8595..497ea76 100644
--- a/src/svg/qsvghandler.cpp
+++ b/src/svg/qsvghandler.cpp
@@ -1203,10 +1203,9 @@ static void parsePen(QSvgNode *node,
         }
 
         //stroke-width handling
-        qreal w = 0;
         if (!attributes.strokeWidth.isEmpty() && attributes.strokeWidth != QT_INHERIT) {
             QSvgHandler::LengthType lt;
-            prop->setWidth(w = parseLength(attributes.strokeWidth.toString(), lt, handler));
+            prop->setWidth(parseLength(attributes.strokeWidth.toString(), lt, handler));
         }
 
         //stroke-dasharray
diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp
index e3b75d0..a6c703f 100644
--- a/src/svg/qsvgstyle.cpp
+++ b/src/svg/qsvgstyle.cpp
@@ -697,14 +697,12 @@ void QSvgAnimateTransform::resolveMatrix(QSvgNode *node)
     case Translate: {
         startElem *= 3;
         endElem   *= 3;
-        qreal from1, from2, from3;
-        qreal to1, to2, to3;
+        qreal from1, from2;
+        qreal to1, to2;
         from1 = m_args[startElem++];
         from2 = m_args[startElem++];
-        from3 = m_args[startElem++];
         to1   = m_args[endElem++];
         to2   = m_args[endElem++];
-        to3   = m_args[endElem++];
 
         qreal transXDiff = (to1-from1) * percentOfAnimation;
         qreal transX = from1 + transXDiff;
@@ -717,14 +715,12 @@ void QSvgAnimateTransform::resolveMatrix(QSvgNode *node)
     case Scale: {
         startElem *= 3;
         endElem   *= 3;
-        qreal from1, from2, from3;
-        qreal to1, to2, to3;
+        qreal from1, from2;
+        qreal to1, to2;
         from1 = m_args[startElem++];
         from2 = m_args[startElem++];
-        from3 = m_args[startElem++];
         to1   = m_args[endElem++];
         to2   = m_args[endElem++];
-        to3   = m_args[endElem++];
 
         qreal transXDiff = (to1-from1) * percentOfAnimation;
         qreal transX = from1 + transXDiff;
@@ -764,14 +760,10 @@ void QSvgAnimateTransform::resolveMatrix(QSvgNode *node)
     case SkewX: {
         startElem *= 3;
         endElem   *= 3;
-        qreal from1, from2, from3;
-        qreal to1, to2, to3;
+        qreal from1;
+        qreal to1;
         from1 = m_args[startElem++];
-        from2 = m_args[startElem++];
-        from3 = m_args[startElem++];
         to1   = m_args[endElem++];
-        to2   = m_args[endElem++];
-        to3   = m_args[endElem++];
 
         qreal transXDiff = (to1-from1) * percentOfAnimation;
         qreal transX = from1 + transXDiff;
@@ -782,14 +774,10 @@ void QSvgAnimateTransform::resolveMatrix(QSvgNode *node)
     case SkewY: {
         startElem *= 3;
         endElem   *= 3;
-        qreal from1, from2, from3;
-        qreal to1, to2, to3;
+        qreal from1;
+        qreal to1;
         from1 = m_args[startElem++];
-        from2 = m_args[startElem++];
-        from3 = m_args[startElem++];
         to1   = m_args[endElem++];
-        to2   = m_args[endElem++];
-        to3   = m_args[endElem++];
 
 
         qreal transYDiff = (to1 - from1) * percentOfAnimation;