diff options
author | Sami Merilä <sami.merila@nokia.com> | 2009-12-07 09:44:03 (GMT) |
---|---|---|
committer | Sami Merilä <sami.merila@nokia.com> | 2009-12-07 09:44:03 (GMT) |
commit | 91b4a40bd3cc9d004baddd9c19ced07ed37afef2 (patch) | |
tree | 89a31b0941d4f8b103bf13a701253a8b109aa342 | |
parent | 63318f834671552add4fd584e5aae80523b5f007 (diff) | |
download | Qt-91b4a40bd3cc9d004baddd9c19ced07ed37afef2.zip Qt-91b4a40bd3cc9d004baddd9c19ced07ed37afef2.tar.gz Qt-91b4a40bd3cc9d004baddd9c19ced07ed37afef2.tar.bz2 |
Remove compilation warning from S60pixelMetrics on ARM
Compiling s60pixelMetrics utility for ARMV5 urel gives two warnings:
a) unused variable - Solution: removed
b) transfer of control bypasses initialization (missing brackets within
a switch-case) - Solution: brackets added.
Reviewed-by: TrustMe
-rw-r--r-- | util/s60pixelmetrics/pixel_metrics.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/util/s60pixelmetrics/pixel_metrics.cpp b/util/s60pixelmetrics/pixel_metrics.cpp index 9507c67..9ba6c8b 100644 --- a/util/s60pixelmetrics/pixel_metrics.cpp +++ b/util/s60pixelmetrics/pixel_metrics.cpp @@ -812,13 +812,12 @@ TInt PixelMetrics::PixelMetricValue(QStyle::PixelMetric metric) value = PixelMetricMenuValue(metric, mainPaneRect); break; case QStyle::PM_ButtonIconSize: + { //lets use voice recorder icons as a base //Unfortunately S60 graphics don't separate button bevel graphics from the actual icon. //Se we have no means to query the margin from bevel border to "central icon" border. //So, we need to make a estimate... - const TInt varietyForButtons = !landscape ? 0 : 1; - TAknLayoutRect vRMainRect; vRMainRect.LayoutRect( mainPaneRect, AknLayoutScalable_Apps::main_vorec_pane() ); @@ -833,7 +832,7 @@ TInt PixelMetrics::PixelMetricValue(QStyle::PixelMetric metric) // 0.32 is the estimate how much the icon occupies of the button bevel area value = vRButtonCellGraphicsRect.Rect().Width() * 0.32; - + } break; case QStyle::PM_SmallIconSize: { |